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/dig.c
+++ b/src/dig.c
@@ -1167,7 +1167,7 @@ struct obj *obj;
        You("cannot stay under%s long enough.",
            is_pool(u.ux, u.uy) ? "water" : " the lava");
    } else if ((trap = t_at(u.ux, u.uy)) != 0
-               && uteetering_at_seen_pit(trap)) {
+               && (uteetering_at_seen_pit(trap) || uescaped_shaft(trap))) {
        dotrap(trap, FORCEBUNGLE);
        /* might escape trap and still be teetering at brink */
        if (!u.utrap)