From a17f11e6c55110dbca634211109f25d5351ce156 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 27 Nov 2021 13:45:23 -0500 Subject: [PATCH] Ignore collisions between 2 objects that are BOTH in hitlag Still allows it if a new object interferes to add more hitlag, but this should hooopefully prevent super big knockback stacking from 1 object? --- src/p_map.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/p_map.c b/src/p_map.c index 099ace8e4..9c3a6ffbf 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -485,6 +485,10 @@ static boolean PIT_CheckThing(mobj_t *thing) || (thing->player && thing->player->spectator)) return true; + // Ignore the collision if BOTH things are in hitlag. + if (thing->hitlag > 0 && tmthing->hitlag > 0) + return true; + if ((thing->flags & MF_NOCLIPTHING) || !(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE|MF_SPRING))) return true;