Merge branch 'ballhog-fixup' into 'master'

Cancel ballhog charge when hit

See merge request KartKrew/Kart!2041
This commit is contained in:
AJ Martinez 2024-03-08 08:41:51 +00:00
commit 266e36928b

View file

@ -9048,6 +9048,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->spinouttimer || player->tumbleBounces)
{
if (player->ballhogcharge)
player->ballhogcharge = 0;
if (player->progressivethrust < MAXCOMBOTIME)
player->progressivethrust++;
if (player->incontrol > 0)