From 85641036ea0faba9416324f692e382906987a9ac Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Fri, 13 Oct 2023 03:19:24 -0700 Subject: [PATCH] Clean up whip/guard timing defs --- src/k_kart.c | 3 +-- src/k_kart.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 7bb18a7c7..19bf552e3 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3691,8 +3691,7 @@ void K_DoGuardBreak(mobj_t *t1, mobj_t *t2) { if (P_PlayerInPain(t2->player)) return; - // short-circuit instashield for vfx visibility - t1->player->instaWhipCharge = GUARDBREAK_COOLDOWN; + t1->player->instaWhipCharge = 0; t1->player->guardCooldown = GUARDBREAK_COOLDOWN; S_StartSound(t1, sfx_gbrk); diff --git a/src/k_kart.h b/src/k_kart.h index ef4b7a265..1aeb16768 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -31,8 +31,6 @@ Make sure this matches the actual number of states #define INSTAWHIP_DURATION (12) #define INSTAWHIP_COOLDOWN (5*TICRATE/4) -#define INSTAWHIP_STARTOFRACE (255) -#define INSTAWHIP_STARTOFBATTLE (1) #define INSTAWHIP_DROPGUARD (12) #define GUARDBREAK_COOLDOWN (TICRATE*4)