From a52da75df2a24f78ca8574deb2cfff170dd16495 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Fri, 12 Apr 2024 15:27:57 -0700 Subject: [PATCH] Prevent weird 1-frame whip trick that I don't understand --- src/k_kart.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index d5e0c23a3..a5afdffeb 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -12351,6 +12351,14 @@ void K_MoveKartPlayer(player_t *player, boolean onground) player->instaWhipCharge = 0; } + // OOPSIES PIXME pt.4: There's some really specific circumstance where a held Item input won't cancel an + // ongoing roulette, which allows you enough time to charge a whip, except the animation is fucking + // invisible. Great! Just hack this for release, sorry. + if (player->itemRoulette.active) + { + player->instaWhipCharge = min(player->instaWhipCharge, INSTAWHIP_CHARGETIME - 1); + } + if (player && player->mo && player->mo->health > 0 && !player->spectator && !P_PlayerInPain(player) && !mapreset && leveltime > introtime) { // First, the really specific, finicky items that function without the item being directly in your item slot.