From 3724dd542baab5c1c044ee243352b335758a9ea2 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 15 Jan 2024 23:34:34 -0800 Subject: [PATCH] Battle: do not reduce hitlag for Insta-Whip (DMG_WHUMBLE), prevent double-damage window --- src/p_inter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index a36f74262..b645d374f 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3471,7 +3471,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (source && source->player && target) G_GhostAddHit((INT32) (source->player - players), target); - if ((gametyperules & GTR_BUMPERS) && !battleprisons) + // Insta-Whip (DMG_WHUMBLE): do not reduce hitlag because + // this can leave room for double-damage. + if ((damagetype & DMG_TYPEMASK) != DMG_WHUMBLE && (gametyperules & GTR_BUMPERS) && !battleprisons) laglength /= 2; K_SetHitLagForObjects(target, inflictor, source, laglength, true);