From eac2aea0825f4aafb4a9b41c44db2275e14bdc91 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 3 May 2022 21:34:33 -0700 Subject: [PATCH] Add 2 seconds instead of 5 upon Invincibility hit, in Battle --- src/p_inter.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 4689847be..83a6eb83c 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1833,7 +1833,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da boolean force = false; INT32 laglength = 6; - INT32 kinvextend = 0; if (objectplacing) return false; @@ -2006,9 +2005,14 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // Extend the invincibility if the hit was a direct hit. if (inflictor == source && source->player->invincibilitytimer) { - kinvextend = (source->player->invincibilitytimer)+5*TICRATE; - //CONS_Printf("extend k_invincibilitytimer for %s - old value %d new value %d\n", player_names[source->player - players], source->player->invincibilitytimer/TICRATE, kinvextend/TICRATE); - source->player->invincibilitytimer = kinvextend; + tic_t kinvextend; + + if (gametype == GT_BATTLE) + kinvextend = 2*TICRATE; + else + kinvextend = 5*TICRATE; + + source->player->invincibilitytimer += kinvextend; } K_PlayHitEmSound(source, target);