From: nhmall <nhmall@nethack.org>
Date: Thu, 19 Dec 2019 23:32:53 +0000 (-0500)
Subject: Merge branch 'NetHack-3.7' into copperwater-hallutraps-3.7
X-Git-Tag: NetHack-3.7.0_WIP~113^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff48672e0b2cb293c0674e99386034980c4a0c9d;p=nethack

Merge branch 'NetHack-3.7' into copperwater-hallutraps-3.7
---

ff48672e0b2cb293c0674e99386034980c4a0c9d
diff --cc src/trap.c
index 59eee97bb,0c8936fa3..2b6633e94
--- a/src/trap.c
+++ b/src/trap.c
@@@ -1280,10 -1290,10 +1290,10 @@@ unsigned trflags
          if (!Can_fall_thru(&u.uz)) {
              seetrap(trap); /* normally done in fall_through */
              impossible("dotrap: %ss cannot exist on this level.",
 -                       defsyms[trap_to_defsym(ttype)].explanation);
 +                       trapname(ttype, TRUE));
              break; /* don't activate it after all */
          }
-         fall_through(TRUE);
+         fall_through(TRUE, (trflags & TOOKPLUNGE));
          break;
  
      case TELEP_TRAP: