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

Fix earthquake causing boulder on lava sanity

Browse Source 
Before checking if lava or water fills in the pit created by
an earthquake, drop the boulder on the pit into it.
This commit is contained in:
Pasi Kallinen
2023-12-13 14:25:24 +02:00
parent 3cfd579d37
commit b9768ad43a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/music.c
View File

@@ -333,18 +333,6 @@ do_earthquake(int force)
break; /* no pit if portal at that location */
chasm->tseen = 1;
/* Let liquid flow into the newly created chasm.
Adjust corresponding code in apply.c for exploding
wand of digging if you alter this sequence. */
filltype = fillholetyp(x, y, FALSE);
if (filltype != ROOM) {
set_levltyp(x, y, filltype); /* levl[x][y] = filltype; */
liquid_flow(x, y, filltype, chasm, (char *) 0);
/* liquid_flow() deletes trap, might kill mtmp */
if ((chasm = t_at(x, y)) == NULL)
break; /* from switch, not loop */
}
mtmp = m_at(x, y); /* (redundant?) */
if ((otmp = sobj_at(BOULDER, x, y)) != 0) {
if (cansee(x, y))
@@ -357,6 +345,18 @@ do_earthquake(int force)
break; /* from switch, not loop */
}
/* Let liquid flow into the newly created chasm.
Adjust corresponding code in apply.c for exploding
wand of digging if you alter this sequence. */
filltype = fillholetyp(x, y, FALSE);
if (filltype != ROOM) {
set_levltyp(x, y, filltype); /* levl[x][y] = filltype; */
liquid_flow(x, y, filltype, chasm, (char *) 0);
/* liquid_flow() deletes trap, might kill mtmp */
if ((chasm = t_at(x, y)) == NULL)
break; /* from switch, not loop */
}
/* We have to check whether monsters or hero falls into a
new pit.... Note: if we get here, chasm is non-Null. */
if (mtmp) {