stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-21 03:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'soundsystemfix' into 'master'

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