P_MobjRegularThink for new objects: Return early if certain objects that self-delete do so on this frame

This commit is contained in:
toaster 2023-09-26 22:53:44 +01:00
parent 5c57214e8c
commit 4a2f3745f0

View file

@ -9723,10 +9723,18 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
case MT_LSZ_EGGBALL: case MT_LSZ_EGGBALL:
Obj_EggBallThink(mobj); Obj_EggBallThink(mobj);
if (P_MobjWasRemoved(mobj))
{
return false;
}
break; break;
case MT_DLZ_ROCKET: case MT_DLZ_ROCKET:
Obj_DLZRocketThink(mobj); Obj_DLZRocketThink(mobj);
if (P_MobjWasRemoved(mobj))
{
return false;
}
break; break;
case MT_DLZ_SEASAW_SPAWN: case MT_DLZ_SEASAW_SPAWN:
@ -9735,6 +9743,10 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
case MT_DLZ_SUCKEDRING: case MT_DLZ_SUCKEDRING:
Obj_DLZSuckedRingThink(mobj); Obj_DLZSuckedRingThink(mobj);
if (P_MobjWasRemoved(mobj))
{
return false;
}
break; break;
case MT_WATERPALACETURBINE: case MT_WATERPALACETURBINE:
@ -9743,6 +9755,10 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
case MT_WATERPALACEBUBBLE: case MT_WATERPALACEBUBBLE:
Obj_WPZBubbleThink(mobj); Obj_WPZBubbleThink(mobj);
if (P_MobjWasRemoved(mobj))
{
return false;
}
break; break;
case MT_WATERPALACEFOUNTAIN: case MT_WATERPALACEFOUNTAIN:
@ -9755,6 +9771,10 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
case MT_KURAGENBOMB: case MT_KURAGENBOMB:
Obj_WPZKuragenBombThink(mobj); Obj_WPZKuragenBombThink(mobj);
if (P_MobjWasRemoved(mobj))
{
return false;
}
break; break;
default: default: