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

Merge branch 'soundsystemfix' into 'master' 

Sound system startup fix

Closes #281

See merge request STJr/SRB2Internal!465
This commit is contained in:
MascaraSnake 2019-11-14 17:50:41 -05:00
parent 8f6890025c 261041dc69
commit 07ea748d96
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/s_sound.c
View File

@ -2530,6 +2530,7 @@ void GameSounds_OnChange(void)
if (sound_disabled) if (sound_disabled)
{ {
sound_disabled = false; sound_disabled = false;
I_StartupSound(); // will return early if initialised
S_InitSfxChannels(cv_soundvolume.value); S_InitSfxChannels(cv_soundvolume.value);
S_StartSound(NULL, sfx_strpst); S_StartSound(NULL, sfx_strpst);
} }
@ -2550,6 +2551,7 @@ void GameDigiMusic_OnChange(void)
if (digital_disabled) if (digital_disabled)
{ {
digital_disabled = false; digital_disabled = false;
I_StartupSound(); // will return early if initialised
I_InitMusic(); I_InitMusic();
S_StopMusic(); S_StopMusic();
if (Playing()) if (Playing())
@ -2592,6 +2594,7 @@ void GameMIDIMusic_OnChange(void)
if (midi_disabled) if (midi_disabled)
{ {
midi_disabled = false; midi_disabled = false;
I_StartupSound(); // will return early if initialised
I_InitMusic(); I_InitMusic();
if (Playing()) if (Playing())
P_RestoreMusic(&players[consoleplayer]); P_RestoreMusic(&players[consoleplayer]);