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

eliminate some gotos on do_earthquake()

Browse Source
This commit is contained in:
SHIRAKATA Kentaro
2024-09-20 01:00:37 +09:00
parent aaac9dc1f7
commit ee137de820
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/music.c
+16 -9
View File
@@ -216,6 +216,7 @@ charm_monsters(int distance)
} }
} }
/* Try to make a pit. */
staticfn void staticfn void
do_pit(coordxy x, coordxy y, unsigned tu_pit) do_pit(coordxy x, coordxy y, unsigned tu_pit)
{ {
@@ -408,11 +409,13 @@ do_earthquake(int force)
case FOUNTAIN: /* make the fountain disappear */ case FOUNTAIN: /* make the fountain disappear */
if (cansee(x, y)) if (cansee(x, y))
pline_The("fountain falls%s.", into_a_chasm); pline_The("fountain falls%s.", into_a_chasm);
goto do_pit; do_pit(x, y, tu_pit);
break;
case SINK: case SINK:
if (cansee(x, y)) if (cansee(x, y))
pline_The("kitchen sink falls%s.", into_a_chasm); pline_The("kitchen sink falls%s.", into_a_chasm);
goto do_pit; do_pit(x, y, tu_pit);
break;
case ALTAR: case ALTAR:
amsk = altarmask_at(x, y); amsk = altarmask_at(x, y);
/* always preserve the high altars */ /* always preserve the high altars */
@@ -423,15 +426,18 @@ do_earthquake(int force)
pline_The("%s altar falls%s.", pline_The("%s altar falls%s.",
align_str(algn), into_a_chasm); align_str(algn), into_a_chasm);
desecrate_altar(FALSE, algn); desecrate_altar(FALSE, algn);
goto do_pit; do_pit(x, y, tu_pit);
break;
case GRAVE: case GRAVE:
if (cansee(x, y)) if (cansee(x, y))
pline_The("headstone topples%s.", into_a_chasm); pline_The("headstone topples%s.", into_a_chasm);
goto do_pit; do_pit(x, y, tu_pit);
break;
case THRONE: case THRONE:
if (cansee(x, y)) if (cansee(x, y))
pline_The("throne falls%s.", into_a_chasm); pline_The("throne falls%s.", into_a_chasm);
goto do_pit; do_pit(x, y, tu_pit);
break;
case SCORR: case SCORR:
levl[x][y].typ = CORR; levl[x][y].typ = CORR;
unblock_point(x, y); unblock_point(x, y);
@@ -439,8 +445,7 @@ do_earthquake(int force)
pline("A secret corridor is revealed."); pline("A secret corridor is revealed.");
/*FALLTHRU*/ /*FALLTHRU*/
case CORR: case CORR:
case ROOM: /* Try to make a pit. */ case ROOM:
do_pit:
do_pit(x, y, tu_pit); do_pit(x, y, tu_pit);
break; break;
case SDOOR: case SDOOR:
@@ -450,8 +455,10 @@ do_earthquake(int force)
/*FALLTHRU*/ /*FALLTHRU*/
case DOOR: /* make the door collapse */ case DOOR: /* make the door collapse */
/* if already doorless, treat like room or corridor */ /* if already doorless, treat like room or corridor */
if (levl[x][y].doormask == D_NODOOR) if (levl[x][y].doormask == D_NODOOR) {
goto do_pit; do_pit(x, y, tu_pit);
break;
}
/* wasn't doorless, now it will be */ /* wasn't doorless, now it will be */
levl[x][y].doormask = D_NODOOR; levl[x][y].doormask = D_NODOOR;
unblock_point(x, y); unblock_point(x, y);