Merge branch 'kix' into 'master'

Block disabling Kickstart Accel during Tricks and when pressing Spindash (resolves #96)

Closes #96

See merge request KartKrew/RingRacers!20
This commit is contained in:
Eidolon 2024-05-19 19:30:32 +00:00
commit 5887f4418b

View file

@ -4255,7 +4255,7 @@ void P_PlayerThink(player_t *player)
} }
else if (cmd->buttons & BT_ACCELERATE) else if (cmd->buttons & BT_ACCELERATE)
{ {
if (!player->exiting && !(player->oldcmd.buttons & BT_ACCELERATE)) if (!player->exiting && !(player->oldcmd.buttons & BT_ACCELERATE) && ((cmd->buttons & BT_SPINDASHMASK) != BT_SPINDASHMASK) && player->trickpanel != TRICKSTATE_READY)
{ {
player->kickstartaccel = 0; player->kickstartaccel = 0;
} }