nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

untrap() formatting bits

Browse Source
This commit is contained in:
PatR
2017-10-05 02:38:25 -07:00
parent e8b9805124
commit 605227c0d6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/trap.c
View File

@@ -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!");