From 605227c0d693785209c7c32274835e1a02ef770e Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 5 Oct 2017 02:38:25 -0700 Subject: [PATCH] untrap() formatting bits --- src/trap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/trap.c b/src/trap.c index 91584da94..53493d426 100644 --- 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!"); -- 2.40.0