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

B10005 fire traps under water

Browse Source 
<Someone> reported that after pushing a boulder into a pool location which
contained a fire trap on the bottom, that the trap wasn't destroyed.  Added
missing delfloortrap call.
This commit is contained in:
cohrs
2002-10-14 00:10:44 +00:00
parent 211f09b9ee
commit a8f4069c30
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.1
View File

@@ -277,6 +277,7 @@ when summoning nasty monsters, use new monster's type to decide if they can
don't display the "intones:" prefix when !soundok since the message suffix don't display the "intones:" prefix when !soundok since the message suffix
won't be displayed in this case won't be displayed in this case
document "sound" option in Guidebook document "sound" option in Guidebook
destroy traps that are buried by boulders dropped in water
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

4
src/do.c
View File

@@ -72,13 +72,17 @@ boolean pushing;
fills_up = lava ? chance == 0 : chance != 0; fills_up = lava ? chance == 0 : chance != 0;
if (fills_up) { if (fills_up) {
struct trap *ttmp = t_at(rx, ry);
if (ltyp == DRAWBRIDGE_UP) { if (ltyp == DRAWBRIDGE_UP) {
levl[rx][ry].drawbridgemask &= ~DB_UNDER; /* clear lava */ levl[rx][ry].drawbridgemask &= ~DB_UNDER; /* clear lava */
levl[rx][ry].drawbridgemask |= DB_FLOOR; levl[rx][ry].drawbridgemask |= DB_FLOOR;
} else } else
levl[rx][ry].typ = ROOM; levl[rx][ry].typ = ROOM;
if (ttmp) (void) delfloortrap(ttmp);
bury_objs(rx, ry); bury_objs(rx, ry);
newsym(rx,ry); newsym(rx,ry);
if (pushing) { if (pushing) {
You("push %s into the %s.", the(xname(otmp)), what); You("push %s into the %s.", the(xname(otmp)), what);