From 32c12dbd651994e97e0b3cf60858f61f3efa64ea Mon Sep 17 00:00:00 2001
From: MIDIMan <miditheman2.0@gmail.com>
Date: Wed, 13 Mar 2024 15:11:24 -0400
Subject: [PATCH] Make P_BlockThingIterator more reliable
---
src/p_enemy.c | 6 +++---
src/p_map.c | 6 +++---
src/p_maputl.c | 18 +++++++++++-------
src/p_maputl.h | 4 ++--
src/p_mobj.c | 2 +-
src/p_user.c | 2 +-
6 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 4990db6fd5..f56f3af040 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -5851,7 +5851,7 @@ void A_MinusDigging(mobj_t *actor)
minus = actor;
- P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_MinusCarry);
+ P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_MinusCarry, minus);
}
else
{
@@ -13995,7 +13995,7 @@ void A_DustDevilThink(mobj_t *actor)
dustdevil = actor;
- P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_DustDevilLaunch);
+ P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_DustDevilLaunch, dustdevil);
//Whirlwind sound effect.
if (leveltime % 70 == 0)
@@ -14111,7 +14111,7 @@ void A_TNTExplode(mobj_t *actor)
barrel = actor;
- P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_TNTExplode);
+ P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_TNTExplode, barrel);
// cause a quake -- P_StartQuake does not exist yet
epicenter.x = actor->x;
diff --git a/src/p_map.c b/src/p_map.c
index f97ddfa3cd..fadd2dabdb 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2267,7 +2267,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
for (bx = xl; bx <= xh; bx++)
for (by = yl; by <= yh; by++)
{
- if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
+ if (!P_BlockThingsIterator(bx, by, PIT_CheckThing, tmthing))
blockval = false;
else
tmhitthing = tmfloorthing;
@@ -2883,7 +2883,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
standx = x;
standy = y;
- P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_PushableMoved);
+ P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_PushableMoved, thing);
}
// Link the thing into its new position
@@ -4227,7 +4227,7 @@ void P_RadiusAttack(mobj_t *spot, mobj_t *source, fixed_t damagedist, UINT8 dama
bombdamagetype = damagetype;
bombsightcheck = sightcheck;
- P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_RadiusAttack);
+ P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_RadiusAttack, bombspot);
}
//
diff --git a/src/p_maputl.c b/src/p_maputl.c
index 8d39b42fc6..aaa5536032 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -1024,10 +1024,14 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
//
// P_BlockThingsIterator
//
-boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *))
+boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *), mobj_t *thing)
{
mobj_t *mobj;
blocknode_t *block;
+
+ boolean checkthing = false;
+ if (thing != NULL) // TODO: Use P_MobjWasRemoved here?
+ checkthing = true;
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
return true;
@@ -1039,20 +1043,20 @@ boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *))
if (!func(mobj))
return false;
- if (P_MobjWasRemoved(tmthing)) // func just broke blockmap chain, cannot continue.
+ if (checkthing && P_MobjWasRemoved(thing)) // func just broke blockmap chain, cannot continue.
return true;
}
return true;
}
-boolean P_DoBlockThingsIterate(int x1, int y1, int x2, int y2, boolean (*func)(mobj_t *))
+boolean P_DoBlockThingsIterate(int x1, int y1, int x2, int y2, boolean (*func)(mobj_t *), mobj_t *thing)
{
boolean status = true;
for (INT32 bx = x1; bx <= x2; bx++)
for (INT32 by = y1; by <= y2; by++)
- if (!P_BlockThingsIterator(bx, by, func))
+ if (!P_BlockThingsIterator(bx, by, func, thing))
status = false;
return status;
@@ -1534,7 +1538,7 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
return false; // early out
if (flags & PT_ADDTHINGS)
- if (!P_BlockThingsIterator(mapx, mapy, PIT_AddThingIntercepts))
+ if (!P_BlockThingsIterator(mapx, mapy, PIT_AddThingIntercepts, NULL))
return false; // early out
// both coordinates reached the end, so end the traversing.
@@ -1578,9 +1582,9 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
if (flags & PT_ADDTHINGS)
{
- if (!P_BlockThingsIterator(mapx + mapxstep, mapy, PIT_AddThingIntercepts))
+ if (!P_BlockThingsIterator(mapx + mapxstep, mapy, PIT_AddThingIntercepts, NULL))
return false; // early out
- if (!P_BlockThingsIterator(mapx, mapy + mapystep, PIT_AddThingIntercepts))
+ if (!P_BlockThingsIterator(mapx, mapy + mapystep, PIT_AddThingIntercepts, NULL))
return false; // early out
}
diff --git a/src/p_maputl.h b/src/p_maputl.h
index e894c08a24..328f5a1591 100644
--- a/src/p_maputl.h
+++ b/src/p_maputl.h
@@ -61,7 +61,7 @@ extern ffloor_t *openfloorrover, *openceilingrover;
void P_LineOpening(line_t *plinedef, mobj_t *mobj);
boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean(*func)(line_t *));
-boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean(*func)(mobj_t *));
+boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean(*func)(mobj_t *), mobj_t *thing);
void P_ClearBlockNodes(void);
@@ -94,7 +94,7 @@ typedef struct bthingit_s
bthingit_t *P_NewBlockThingsIterator(int x1, int y1, int x2, int y2);
mobj_t *P_BlockThingsIteratorNext(bthingit_t *it, boolean centeronly);
void P_FreeBlockThingsIterator(bthingit_t *it);
-boolean P_DoBlockThingsIterate(int x1, int y1, int x2, int y2, boolean (*func)(mobj_t *));
+boolean P_DoBlockThingsIterate(int x1, int y1, int x2, int y2, boolean (*func)(mobj_t *), mobj_t *thing);
#define PT_ADDLINES 1
#define PT_ADDTHINGS 2
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 9cdd2628db..c791bd368c 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9339,7 +9339,7 @@ static void P_PointPushThink(mobj_t *mobj)
yl = (unsigned)(mobj->y - radius - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
yh = (unsigned)(mobj->y + radius - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
- P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_PushThing);
+ P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_PushThing, pushmobj);
}
static boolean P_MobjRegularThink(mobj_t *mobj)
diff --git a/src/p_user.c b/src/p_user.c
index 7cd128cf08..1011bf2086 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4115,7 +4115,7 @@ static void P_DoTeeter(player_t *player)
teeteryl = teeteryh = player->mo->y;
couldteeter = false;
solidteeter = teeter;
- if (!P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_CheckSolidsTeeter))
+ if (!P_DoBlockThingsIterate(xl, yl, xh, yh, PIT_CheckSolidsTeeter, tmthing))
goto teeterdone; // we've found something that stops us teetering at all
teeterdone:
teeter = solidteeter;
--
GitLab