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-grow-music' into 'master'

Browse source 
Fix powerup music inconsistencies (resolves #460)

Closes #460

See merge request KartKrew/Kart!1001
This commit is contained in:
toaster 2023-03-02 14:37:21 +00:00
commit 884f03c043
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_kart.c
View file

@ -5930,9 +5930,7 @@ void K_DoInvincibility(player_t *player, tic_t time)
P_SetScale(overlay, player->mo->scale); P_SetScale(overlay, player->mo->scale);
} }
player->invincibilitytimer += time; if (P_IsLocalPlayer(player) == true && player->invincibilitytimer == 0)
if (P_IsLocalPlayer(player) == true)
{ {
S_ChangeMusicSpecial("kinvnc"); S_ChangeMusicSpecial("kinvnc");
} }
@ -5941,6 +5939,8 @@ void K_DoInvincibility(player_t *player, tic_t time)
S_StartSound(player->mo, sfx_alarmi); S_StartSound(player->mo, sfx_alarmi);
} }
player->invincibilitytimer += time;
P_RestoreMusic(player); P_RestoreMusic(player);
} }
@ -10540,11 +10540,11 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
S_StartSound(player->mo, sfx_alarmg); S_StartSound(player->mo, sfx_alarmg);
} }
P_RestoreMusic(player);
player->growshrinktimer = max(0, player->growshrinktimer); player->growshrinktimer = max(0, player->growshrinktimer);
player->growshrinktimer += ((gametyperules & GTR_CLOSERPLAYERS) ? 8 : 12) * TICRATE; player->growshrinktimer += ((gametyperules & GTR_CLOSERPLAYERS) ? 8 : 12) * TICRATE;
P_RestoreMusic(player);
S_StartSound(player->mo, sfx_kc5a); S_StartSound(player->mo, sfx_kc5a);
player->itemamount--; player->itemamount--;