Merge branch 'NetHack-3.6'

2019-11-29 16:57:23 -05:00
parent 2954608a39 49e4dfbc0f
commit 8cd73c8cc9
9 changed files with 32 additions and 16 deletions
--- a/src/sit.c
+++ b/src/sit.c
@@ -67,7 +67,7 @@ dosit()

    if (OBJ_AT(u.ux, u.uy)
        /* ensure we're not standing on the precipice */
-        && !uteetering_at_seen_pit(trap)) {
+        && !(uteetering_at_seen_pit(trap) || uescaped_shaft(trap))) {
        register struct obj *obj;

        obj = g.level.objects[u.ux][u.uy];