thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-ballhog-interrupt' into 'master'

Browse source 
Cut Ballhog overcharge and wavedash sounds when interrupted

Closes #1630

See merge request kart-krew-dev/ring-racers-internal!2745
This commit is contained in:
Oni VelocitOni 2025-08-22 06:57:09 +00:00
commit dcf4c8b68d
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/k_kart.c
View file

@ -10220,6 +10220,12 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
}
}
if (player->itemtype != KITEM_BALLHOG || player->itemamount == 0 || P_PlayerInPain(player))
{
player->ballhogcharge = 0;
player->ballhogburst = 0;
S_StopSoundByID(player->mo, sfx_gshda);
}
if (player->wavedashboost == 0 || player->wavedashpower > FRACUNIT)
{
@ -12524,6 +12530,12 @@ static void K_KartDrift(player_t *player, boolean onground)
player->wavedashright = 0;
player->wavedashboost = 0;
player->trickcharge = 0;
S_StopSoundByID(player->mo, sfx_waved1);
S_StopSoundByID(player->mo, sfx_waved2);
S_StopSoundByID(player->mo, sfx_waved3);
S_StopSoundByID(player->mo, sfx_waved4);
S_StopSoundByID(player->mo, sfx_waved5);
}
else if ((player->pflags & PF_DRIFTINPUT) && player->drift != 0)
{