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/pickup.c
+++ b/src/pickup.c
@@ -509,7 +509,7 @@ int what; /* should be a long */
        if (!can_reach_floor(TRUE)) {
            if ((g.multi && !g.context.run) || (autopickup && !flags.pickup)
                || ((ttmp = t_at(u.ux, u.uy)) != 0
-                    && uteetering_at_seen_pit(ttmp)))
+                    && (uteetering_at_seen_pit(ttmp) || uescaped_shaft(ttmp))))
                read_engr_at(u.ux, u.uy);
            return 0;
        }