mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 21:01:04 +00:00
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:
commit
ea4ce70fde
1 changed files with 2 additions and 2 deletions
|
@ -1584,6 +1584,7 @@ static void Command_Tunes_f(void)
|
|||
static void Command_RestartAudio_f(void)
|
||||
{
|
||||
S_StopMusic();
|
||||
S_StopSounds();
|
||||
I_ShutdownMusic();
|
||||
I_ShutdownSound();
|
||||
I_StartupSound();
|
||||
|
@ -1592,8 +1593,7 @@ static void Command_RestartAudio_f(void)
|
|||
// These must be called or no sound and music until manually set.
|
||||
|
||||
I_SetSfxVolume(cv_soundvolume.value);
|
||||
I_SetDigMusicVolume(cv_digmusicvolume.value);
|
||||
I_SetMIDIMusicVolume(cv_midimusicvolume.value);
|
||||
S_SetMusicVolume(cv_digmusicvolume.value, cv_midimusicvolume.value);
|
||||
if (Playing()) // Gotta make sure the player is in a level
|
||||
P_RestoreMusic(&players[consoleplayer]);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue