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

4
src/monmove.c
View File

@@ -1021,7 +1021,7 @@ m_move(register struct monst* mtmp, register int after)
int omx = mtmp->mx, omy = mtmp->my;
if (mtmp->mtrapped) {
int i = mintrap(mtmp);
int i = mintrap(mtmp, NO_TRAP_FLAGS);
if (i == Trap_Killed_Mon) {
newsym(mtmp->mx, mtmp->my);
@@ -1491,7 +1491,7 @@ m_move(register struct monst* mtmp, register int after)
}
newsym(omx, omy); /* update the old position */
if (mintrap(mtmp) == Trap_Killed_Mon) {
if (mintrap(mtmp, NO_TRAP_FLAGS) == Trap_Killed_Mon) {
if (mtmp->mx)
newsym(mtmp->mx, mtmp->my);
return 2; /* it died */