lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move S_InitMusicDefs call outside of the check.

Browse source 
As far as I know, this is competely safe.
This commit is contained in:
Steel Titanium 2019-12-12 16:32:40 -05:00
parent 4af0cfae36
commit eb787c2b59
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_main.c
View file

@ -1281,9 +1281,10 @@ void D_SRB2Main(void)
I_StartupSound(); I_StartupSound();
I_InitMusic(); I_InitMusic();
S_InitSfxChannels(cv_soundvolume.value); S_InitSfxChannels(cv_soundvolume.value);
S_InitMusicDefs();
} }
S_InitMusicDefs();
CONS_Printf("ST_Init(): Init status bar.\n"); CONS_Printf("ST_Init(): Init status bar.\n");
ST_Init(); ST_Init();

2
src/s_sound.c
View file

@ -2543,7 +2543,6 @@ void GameDigiMusic_OnChange(void)
I_StartupSound(); // will return early if initialised I_StartupSound(); // will return early if initialised
I_InitMusic(); I_InitMusic();
S_StopMusic(); S_StopMusic();
S_InitMusicDefs();
if (Playing()) if (Playing())
P_RestoreMusic(&players[consoleplayer]); P_RestoreMusic(&players[consoleplayer]);
else else
@ -2586,7 +2585,6 @@ void GameMIDIMusic_OnChange(void)
midi_disabled = false; midi_disabled = false;
I_StartupSound(); // will return early if initialised I_StartupSound(); // will return early if initialised
I_InitMusic(); I_InitMusic();
S_InitMusicDefs();
if (Playing()) if (Playing())
P_RestoreMusic(&players[consoleplayer]); P_RestoreMusic(&players[consoleplayer]);
else else