untrap() formatting bits

diff --git a/src/trap.c b/src/trap.c
index 91584da94981d39542bb3c9e52aa7af172bee787..53493d4262812e6e87145f2d9418b6a369c24b4e 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -4242,8 +4242,9 @@ boolean force;
     struct trap *ttmp;
     struct monst *mtmp;
     const char *trapdescr;
-    boolean here, useplural, confused = (Confusion || Hallucination),
-                             trap_skipped = FALSE, deal_with_floor_trap;
+    boolean here, useplural, deal_with_floor_trap,
+            confused = (Confusion || Hallucination),
+            trap_skipped = FALSE;
     int boxcnt = 0;
     char the_trap[BUFSZ], qbuf[QBUFSZ];
 
@@ -4434,7 +4435,7 @@ boolean force;
         return 0;
     }
 
-    if ((levl[x][y].doormask & D_TRAPPED
+    if (((levl[x][y].doormask & D_TRAPPED) != 0
          && (force || (!confused && rn2(MAXULEV - u.ulevel + 11) < 10)))
         || (!force && confused && !rn2(3))) {
         You("find a trap on the door!");