From e07fb31f723b382993bf687933eafc46ed7d2cd5 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 18 Mar 2022 17:35:34 +0000 Subject: [PATCH] P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely) # Conflicts: # src/p_mobj.c --- src/p_mobj.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index 48fb94b92..7ce5267e5 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2288,6 +2288,9 @@ boolean P_ZMovement(mobj_t *mo) } P_CheckPosition(mo, mo->x, mo->y); // Sets mo->standingslope correctly + if (P_MobjWasRemoved(mo)) // mobjs can be removed by P_CheckPosition -- Monster Iestyn 31/07/21 + return false; + K_UpdateMobjTerrain(mo, ((mo->eflags & MFE_VERTICALFLIP) ? tmceilingpic : tmfloorpic)); if (((mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope) && (mo->type != MT_STEAM))