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

Prevent hero from falling past end of dungeon

Browse Source 
Similar story with saved trap door destinations: if a bones file near
the end of the dungeon came from a longer dungeon (i.e. with a
lower-depth castle) than the one the bones file is loaded into, the
trap door destination could be past the dungeon end.  Clamp the
destination so it won't be lower than the bottom level of the dungeon.
This commit is contained in:
Michael Meyer
2022-09-21 19:55:04 -04:00
committed by Pasi Kallinen
parent 9bb09d48f1
commit 1830b206c7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/trap.c
View File

@@ -580,15 +580,18 @@ fall_through(
if (Is_stronghold(&u.uz)) {
find_hell(&dtmp);
} else {
int dist = newlevel - dunlev(&u.uz);
int dist;
if (t) {
dtmp.dnum = t->dst.dnum;
dtmp.dlevel = t->dst.dlevel;
/* don't fall beyond the bottom, in case this came from a bones
file with different dungeon size */
dtmp.dlevel = min(t->dst.dlevel, bottom);
dist = dtmp.dlevel - dunlev(&u.uz);
} else {
dtmp.dnum = u.uz.dnum;
dtmp.dlevel = newlevel;
dist = newlevel - dunlev(&u.uz);
}
if (dist > 1)
You("fall down a %s%sshaft!", dist > 3 ? "very " : "",