Merge branch 'brakedrift-whip' into 'master'

Don't cancel whip charge while brakedrifting

Closes #1395

See merge request KartKrew/Kart!2390
This commit is contained in:
Oni 2024-05-20 21:21:06 +00:00
commit 247def32e1

View file

@ -12528,7 +12528,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->instaWhipCharge = 0;
}
if (chargingwhip && K_PressingEBrake(player))
if (chargingwhip && (K_PressingEBrake(player) && player->drift == 0))
{
// 1) E-braking on the ground: cancels Insta-Whip.
// Still lets you keep your Whip while fast-falling.