untrap() formatting bits

This commit is contained in:
PatR
2017-10-05 02:38:25 -07:00
parent e8b9805124
commit 605227c0d6
+4 -3
View File
@@ -4242,8 +4242,9 @@ boolean force;
struct trap *ttmp; struct trap *ttmp;
struct monst *mtmp; struct monst *mtmp;
const char *trapdescr; const char *trapdescr;
boolean here, useplural, confused = (Confusion || Hallucination), boolean here, useplural, deal_with_floor_trap,
trap_skipped = FALSE, deal_with_floor_trap; confused = (Confusion || Hallucination),
trap_skipped = FALSE;
int boxcnt = 0; int boxcnt = 0;
char the_trap[BUFSZ], qbuf[QBUFSZ]; char the_trap[BUFSZ], qbuf[QBUFSZ];
@@ -4434,7 +4435,7 @@ boolean force;
return 0; 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(MAXULEV - u.ulevel + 11) < 10)))
|| (!force && confused && !rn2(3))) { || (!force && confused && !rn2(3))) {
You("find a trap on the door!"); You("find a trap on the door!");