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

Merge branch 'public-music-cleanup-st' into 'music-clean' 

Apply music code cleanup changes

See merge request SteelTitanium/SRB2!1
This commit is contained in:
Steel Titanium 2018-10-20 14:12:58 -04:00
parent 87d3552ff9 cc0d1db9d8
commit ea4ce70fde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/s_sound.c
View File

@ -1584,6 +1584,7 @@ static void Command_Tunes_f(void)
static void Command_RestartAudio_f(void) static void Command_RestartAudio_f(void)
{ {
S_StopMusic(); S_StopMusic();
S_StopSounds();
I_ShutdownMusic(); I_ShutdownMusic();
I_ShutdownSound(); I_ShutdownSound();
I_StartupSound(); I_StartupSound();
@ -1592,8 +1593,7 @@ static void Command_RestartAudio_f(void)
// These must be called or no sound and music until manually set. // These must be called or no sound and music until manually set.
I_SetSfxVolume(cv_soundvolume.value); I_SetSfxVolume(cv_soundvolume.value);
I_SetDigMusicVolume(cv_digmusicvolume.value); S_SetMusicVolume(cv_digmusicvolume.value, cv_midimusicvolume.value);
I_SetMIDIMusicVolume(cv_midimusicvolume.value);
if (Playing()) // Gotta make sure the player is in a level if (Playing()) // Gotta make sure the player is in a level
P_RestoreMusic(&players[consoleplayer]); P_RestoreMusic(&players[consoleplayer]);
} }