Merge branch 'NetHack-3.6.2'

2018-10-06 12:54:27 -04:00
parent c29e4c572e 232f016257
commit 41a10e28ae
42 changed files with 489 additions and 288 deletions
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -1686,9 +1686,9 @@ mkinvokearea()

    /* any trap hero is stuck in will be going away now */
    if (u.utrap) {
-        u.utrap = 0;
        if (u.utraptype == TT_BURIEDBALL)
            buried_ball_to_punishment();
+        reset_utrap(FALSE);
    }
    mkinvpos(xmin, ymin, 0); /* middle, before placing stairs */