Fix 1 tic of instawhip charge spamming new Reject visuals

This commit is contained in:
AJ Martinez 2024-04-15 04:29:46 -07:00
parent 46c70d2683
commit 391ea40bdc

View file

@ -12351,12 +12351,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->instaWhipCharge = 0; player->instaWhipCharge = 0;
} }
// OOPSIES PIXME pt.4: There's some really specific circumstance where a held Item input won't cancel an // OOPSIES FIXME 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 // ongoing roulette, which allows you enough time to charge a whip, except the animation is fucking
// invisible. Great! Just hack this for release, sorry. // invisible. Great! Just hack this for release, sorry.
if (player->itemRoulette.active) if (player->itemRoulette.active)
{ {
player->instaWhipCharge = min(player->instaWhipCharge, INSTAWHIP_CHARGETIME - 1); player->instaWhipCharge = min(player->instaWhipCharge, INSTAWHIP_CHARGETIME - 2);
} }
if (player && player->mo && player->mo->health > 0 && !player->spectator && !P_PlayerInPain(player) && !mapreset && leveltime > introtime) if (player && player->mo && player->mo->health > 0 && !player->spectator && !P_PlayerInPain(player) && !mapreset && leveltime > introtime)