From 2f6366938511991843c715d05f2f9b9ecd711711 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 14 Apr 2023 14:38:32 +0100 Subject: [PATCH] P_CheckPosition: If thing was removed in its remit and iteration has MF_NOCLIP, do not return true This fixes increment_move in the case of Lightning shield pop --- src/p_map.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_map.c b/src/p_map.c index ed83fd441..62739d935 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -2232,7 +2232,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y, TryMoveResult_t *re // with MF_NOCLIP enabled, but they won't be blocked // regardless of the result. This allows for SPBs and // the UFO to collide. - return true; + // ...but be careful about removed obj! ~toast 140423 + return !P_MobjWasRemoved(thing); } validcount++;