Minor cockatrice fix

PS: Why do we have duplicate fixes__._ files in the branches, since by
definition the same file would have to stay the same in any branch?

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index f34526a89d5eda9f3cfb521c58f62061d1f98c2c..d801890b9f4cd05d3c835aef062e5f93b2f6ad3b 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -413,6 +413,7 @@ character escape sequence handling during options processing was vulernable
        to malformed escapes and could potentially be abused to clobber the
        stack and launch a buffer overrun attack
 fix message typo, "you sold some items inside <container> for N gold piecess"
+fix bug preventing stone-resistant monsters w/o gloves from wielding cockatrices
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 85d70658b3a6bd1215ea0e263d4f6afefae8f336..b210d4ec0fc01eb50fd601334c326d5aba90e771 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -400,6 +400,7 @@ autosearch finds and transforms secret doors and corridors even while blind,
        but it wasn't updating the map to show them unless the hero could see
 panic save made during magic mapping or <foo> detection performed while
        underwater could put hero on top of the water after restore
+fix bug preventing stone-resistant monsters w/o gloves from wielding cockatrices
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/weapon.c b/src/weapon.c
index f7586d6ce6190c9fae3be62a754c16f889fead7e..fa902d6e062cba509d28354b25a3d5da594cbcc6 100644 (file)
--- a/src/weapon.c
+++ b/src/weapon.c
@@ -542,7 +542,7 @@ register struct monst *mtmp;
        /* big weapon is basically the same as bimanual */
        /* all monsters can wield the remaining weapons */
        for (i = 0; i < SIZE(hwep); i++) {
-           if (hwep[i] == CORPSE && !(mtmp->misc_worn_check & W_ARMG))
+           if (hwep[i] == CORPSE && !(mtmp->misc_worn_check & W_ARMG) && !resists_ston(mtmp))
                continue;
            if (((strong && !wearing_shield)
                        || !objects[hwep[i]].oc_bimanual) &&