Merge branch 'soundsystemfix' into 'master'
Sound system startup fix Closes #281 See merge request STJr/SRB2Internal!465
This commit is contained in:
commit
07ea748d96
|
@ -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]);
|
||||||
|
|
Loading…
Reference in New Issue