From bd495c7f55130ad9380f94707564bb57636984a7 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 10 Nov 2020 23:13:32 -0500 Subject: [PATCH] Increase hitlag for bananas from 2 to 5, use 10 for normal damage by default instead Ballhogs & Lightning Shield get intense hitlag again --- src/p_inter.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 499ba5713..acd8f0433 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1759,7 +1759,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da player_t *player; boolean force = false; - INT32 laglength = 3; + INT32 laglength = 10; if (objectplacing) return false; @@ -1774,9 +1774,10 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (source && source->player && source->player->spectator) return false; - if ((damagetype & DMG_TYPEMASK) != DMG_NORMAL && (damagetype & DMG_TYPEMASK) != DMG_STING) + if (((damagetype & DMG_TYPEMASK) == DMG_STING) + || (inflictor->type == MT_BANANA && inflictor->health <= 1)) { - laglength = 10; + laglength = 5; } // Everything above here can't be forced.