Get rid of force_mintrap, allow passing flags to mintrap

It uses the same flags as dotrap, so simulate force_mintrap by passing FORCETRAP flag.
2022-02-24 17:13:20 +02:00
parent 9716f22851
commit 2777f45bd5
19 changed files with 52 additions and 53 deletions
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -921,7 +921,7 @@ mhurtle_step(genericptr_t arg, int x, int y)
        set_apparxy(mon);
        if (is_waterwall(x, y))
            return FALSE;
-        res = mintrap(mon);
+        res = mintrap(mon, NO_TRAP_FLAGS); /* TODO: TEMPFLIGHT? */
        if (res == Trap_Killed_Mon
            || res == Trap_Caught_Mon
            || res == Trap_Moved_Mon)