Merge remote-tracking branch 'github/UniQP/trap' into NetHack-3.6.0

Also update fixes file
2016-04-12 20:53:30 -04:00
parent 1e47807302 545455b8cd
commit 36c3a1c665
2 changed files with 3 additions and 1 deletions
--- a/src/trap.c
+++ b/src/trap.c
@@ -4527,7 +4527,7 @@ boolean *noticed; /* set to true iff hero notices the effect; */
        --force_mintrap;
        /* mon might now be on the migrating monsters list */
    }
-    return TRUE;
+    return result;
 }

 /* only called when the player is doing something to the chest directly */