thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-26 23:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-powerup-music-after-race-finish' into 'master'

Browse source 
P_DoPlayerExit, P_DoTimeOver: replace Music_StopAll with silent track

Closes #759

See merge request KartKrew/Kart!1642
This commit is contained in:
Oni 2023-11-17 09:32:33 +00:00
commit b8a5f49b1d
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/music.cpp
View file

@ -57,6 +57,13 @@ void Music_Init(void)
tune.priority = 21;
}
{
Tune& tune = g_tunes.insert("finish_silence");
tune.song = "";
tune.priority = 30;
}
{
Tune& tune = g_tunes.insert("finish");

4
src/p_user.c
View file

@ -1286,7 +1286,7 @@ void P_DoPlayerExit(player_t *player, pflags_t flags)
if (P_IsLocalPlayer(player) && !specialout && musiccountdown == 0)
{
Music_StopAll();
Music_Play("finish_silence");
musiccountdown = MUSIC_COUNTDOWN_MAX;
}
@ -3789,7 +3789,7 @@ void P_DoTimeOver(player_t *player)
if (P_IsLocalPlayer(player) && musiccountdown == 0)
{
Music_StopAll();
Music_Play("finish_silence");
musiccountdown = MUSIC_COUNTDOWN_MAX;
}