From 2aa52a15b62c5289b54c4e85a510011156bfc3bb Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Mon, 3 Mar 2025 22:26:07 +0100 Subject: [PATCH] Revert P_CheckPosition's MF_NOCLIP behavior Seems to have been unintenionally yoinked in 122b2696, and it causes an obnoxious amount of lag for grindrails --- src/p_map.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index a2300f3c7..d2bf1a689 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -2038,6 +2038,9 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y, TryMoveResult_t *re // reset special lines numspechit = 0U; + if (g_tm.flags & MF_NOCLIP) + return true; + // Check things first, possibly picking things up. // MF_NOCLIPTHING: used by camera to not be blocked by things @@ -2065,16 +2068,6 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y, TryMoveResult_t *re } } - if (g_tm.flags & MF_NOCLIP) - { - // Sal 12/19/2022 -- PIT_CheckThing code will still run - // with MF_NOCLIP enabled, but they won't be blocked - // regardless of the result. This allows for SPBs and - // the UFO to collide. - // ...but be careful about removed obj! ~toast 140423 - return !P_MobjWasRemoved(thing); - } - validcount++; // check lines