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 'endingmus' into 'master'

Browse source 
Ending music and associated

See merge request STJr/SRB2Internal!475
This commit is contained in:
MascaraSnake 2019-11-18 14:33:22 -05:00
commit 6f8a84b8cc
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/f_finale.c
View file

@ -1388,10 +1388,13 @@ void F_StartGameEvaluation(void)
// Credits option in secrets menu // Credits option in secrets menu
if (cursaveslot == -1) if (cursaveslot == -1)
{ {
S_FadeOutStopMusic(2*MUSICRATE);
F_StartGameEnd(); F_StartGameEnd();
return; return;
} }
S_FadeOutStopMusic(5*MUSICRATE);
G_SetGamestate(GS_EVALUATION); G_SetGamestate(GS_EVALUATION);
// Just in case they're open ... somehow // Just in case they're open ... somehow
@ -1638,7 +1641,7 @@ void F_StartEnding(void)
gameaction = ga_nothing; gameaction = ga_nothing;
paused = false; paused = false;
CON_ToggleOff(); CON_ToggleOff();
S_StopMusic(); // todo: placeholder S_StopMusic();
S_StopSounds(); S_StopSounds();
finalecount = -10; // what? this totally isn't a hack. why are you asking? finalecount = -10; // what? this totally isn't a hack. why are you asking?
@ -1719,6 +1722,9 @@ void F_EndingTicker(void)
return; return;
} }
if (finalecount == -8)
S_ChangeMusicInternal((goodending ? "_endg" : "_endb"), false);
if (goodending && finalecount == INFLECTIONPOINT) // time to swap some assets if (goodending && finalecount == INFLECTIONPOINT) // time to swap some assets
{ {
endegrk[0] = W_CachePatchName("ENDEGRK2", PU_LEVEL); endegrk[0] = W_CachePatchName("ENDEGRK2", PU_LEVEL);
@ -2148,7 +2154,6 @@ void F_StartGameEnd(void)
gameaction = ga_nothing; gameaction = ga_nothing;
paused = false; paused = false;
CON_ToggleOff(); CON_ToggleOff();
S_StopMusic();
S_StopSounds(); S_StopSounds();
// In case menus are still up?!! // In case menus are still up?!!