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

Get rid of force_mintrap, allow passing flags to mintrap

Browse Source 
It uses the same flags as dotrap, so simulate force_mintrap
by passing FORCETRAP flag.
This commit is contained in:
Pasi Kallinen
2022-02-24 17:13:20 +02:00
parent 9716f22851
commit 2777f45bd5
19 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/hack.c
View File

@@ -2058,7 +2058,7 @@ domove_core(void)
or blame if something bad happens to it */
g.context.mon_moving = 1;
if (!minliquid(mtmp))
(void) mintrap(mtmp);
(void) mintrap(mtmp, NO_TRAP_FLAGS);
g.context.mon_moving = 0;
/*
@@ -2138,7 +2138,8 @@ domove_core(void)
has_mgivenname(mtmp) ? SUPPRESS_SADDLE : 0, FALSE));
/* check for displacing it into pools and traps */
switch (minliquid(mtmp) ? Trap_Killed_Mon : mintrap(mtmp)) {
switch (minliquid(mtmp) ? Trap_Killed_Mon
: mintrap(mtmp, NO_TRAP_FLAGS)) {
case Trap_Effect_Finished:
break;
case Trap_Caught_Mon: /* trapped */