nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix #H7015 - explosion chain reaction bug

Browse Source 
The fix to prevent "crushed by a gas spore's explosion" set killer.name
to an empty string after a gas spore explosion finished, but that made
nested explosions end up with empty killer.name after the innermost
call completed.  explode() shouldn't have been hanging on to a pointer
to a global value that is subject to change while it executes.  Making
a local copy of the current value at the time explode() is called will
solve that (I hope...).

Simply reverting the reset of killer.name wouldn't have been correct.
The innermost explosion would still be clobbering killer.name for any
outer MON_EXPLODE explosions in progress.  When the only exploding
monster is gas spore, that wouldn't be noticeable.  But having other
types of exploding monsters and a chain reaction which affected more
than one type would have exposed that bug.  I think this fixes both
aspects of this problem but don't have a second type of exploding
monster to verify the second part.
This commit is contained in:
PatR
2018-03-30 17:05:23 -07:00
parent 4eab7b140c
commit c058826995
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.1
+9
View File
@@ -532,6 +532,10 @@ when #force reports that a chest's lock is already broken or already unlocked,
already known, rather than as "a broken chest" or "an unlocked chest"
honor wish for "locked", "unlocked", or "broken" chest or box
honor wish for "empty" container including statue, bag-o-tricks, horn-o-plenty
gas spore explosion killing a gas spore which triggers a recursive explosion
would have killer reason for outer call clobbered by inner one; when
they were both "gas spore's explosion" it wouldn't be noticeable (see
corresponding post-3.6.0 entry for more...)
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
@@ -614,6 +618,11 @@ when clairvoyance lets you move the cursor to examine the map (if it occurs
prevent Mjollnir from being auto-quivered if it's been thrown without return
and then picked back up while quiver slot is empty
plural of "fox" is not "foxen"
gas spore explosion killing a gas spore which triggers a recursive explosion
would have killer reason for outer call clobbered by inner one;
"You are hit by the gas spore's explosion!" (inner call, followed by)
"You are hit by the !" (outer call, possibly repeated for multiple
explosions causing multiple levels of recursion)
Platform- and/or Interface-Specific Fixes
src/explode.c
+5 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 explode.c $NHDT-Date: 1513297345 2017/12/15 00:22:25 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.55 $ */
/* NetHack 3.6 explode.c $NHDT-Date: 1522454717 2018/03/31 00:05:17 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.56 $ */
/* Copyright (C) 1990 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */
@@ -44,7 +44,7 @@ int expltype;
boolean shopdamage = FALSE, generic = FALSE, physical_dmg = FALSE,
do_hallu = FALSE, inside_engulfer, grabbed, grabbing;
coord grabxy;
char hallu_buf[BUFSZ];
char hallu_buf[BUFSZ], killr_buf[BUFSZ];
short exploding_wand_typ = 0;
if (olet == WAND_CLASS) { /* retributive strike */
@@ -114,7 +114,9 @@ int expltype;
*/
if (olet == MON_EXPLODE) {
str = killer.name;
/* when explode() is called recursively, killer.name might change so
we need to retain a copy of the current value for this explosion */
str = strcpy(killr_buf, killer.name);
do_hallu = (Hallucination
&& (strstri(str, "'s explosion")
|| strstri(str, "s' explosion")));