From 2cf8261159ededba5eb104ef0d9f2de4cc33aa20 Mon Sep 17 00:00:00 2001 From: arromdee Date: Sun, 18 Dec 2011 05:16:36 +0000 Subject: [PATCH] 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? --- doc/fixes34.4 | 1 + doc/fixes35.0 | 1 + src/weapon.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/fixes34.4 b/doc/fixes34.4 index f34526a89..d801890b9 100644 --- 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 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 85d70658b..b210d4ec0 100644 --- 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 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 f7586d6ce..fa902d6e0 100644 --- 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) &&