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

6
src/fountain.c
View File

@@ -49,7 +49,7 @@ dowatersnakes(void)
if ((mtmp = makemon(&mons[PM_WATER_MOCCASIN], u.ux, u.uy,
MM_NOMSG)) != 0
&& t_at(mtmp->mx, mtmp->my))
(void) mintrap(mtmp);
(void) mintrap(mtmp, NO_TRAP_FLAGS);
} else
pline_The("fountain bubbles furiously for a moment, then calms.");
}
@@ -76,7 +76,7 @@ dowaterdemon(void)
/* give a wish and discard the monster (mtmp set to null) */
mongrantswish(&mtmp);
} else if (t_at(mtmp->mx, mtmp->my))
(void) mintrap(mtmp);
(void) mintrap(mtmp, NO_TRAP_FLAGS);
}
} else
pline_The("fountain bubbles furiously for a moment, then calms.");
@@ -97,7 +97,7 @@ dowaternymph(void)
You_hear("a seductive voice.");
mtmp->msleeping = 0;
if (t_at(mtmp->mx, mtmp->my))
(void) mintrap(mtmp);
(void) mintrap(mtmp, NO_TRAP_FLAGS);
} else if (!Blind)
pline("A large bubble rises to the surface and pops.");
else