From ab575deaa2589bf6cc7366783f85afe2b5f031dd Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 17 Jan 2024 21:17:50 -0800 Subject: [PATCH] Bubble blow-up: hitlag is based on player's speed, not Bubble's speed --- src/k_hitlag.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/k_hitlag.c b/src/k_hitlag.c index e211e90c0..5a81cfd5a 100644 --- a/src/k_hitlag.c +++ b/src/k_hitlag.c @@ -260,6 +260,12 @@ void K_SetHitLagForObjects(mobj_t *victim, mobj_t *inflictor, mobj_t *source, IN return; } + if (P_MobjWasRemoved(inflictor) == false && inflictor->type == MT_BUBBLESHIELD) + { + // Bubble blow-up: hitlag is based on player's speed + inflictor = source; + } + if (P_MobjWasRemoved(victim) == false && P_MobjWasRemoved(inflictor) == false) { const fixed_t speedTicFactor = (mapobjectscale * 8);