Volume fixes
# Conflicts: # src/sdl/mixer_sound.c (cherry picked from commit d39b7011c5b12e5b7abe3e493971e003469a1f3d)
This commit is contained in:
1 parent
2fbe206ecb
commit
5f22b7d973
2 files changed
+5
-3
No files matched your search
+4
-2
@@ -1465,11 +1465,13 @@ void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume)
|
||||
switch(I_SongType())
|
||||
{
|
||||
case MU_MID:
|
||||
case MU_MOD:
|
||||
case MU_GME:
|
||||
//case MU_MOD:
|
||||
//case MU_GME:
|
||||
I_SetMusicVolume(seqvolume&31);
|
||||
break;
|
||||
default:
|
||||
I_SetMusicVolume(digvolume&31);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -769,7 +769,7 @@ void I_ResumeSong(void)
|
||||
|
||||
void I_SetMusicVolume(UINT8 volume)
|
||||
{
|
||||
if (!music)
|
||||
if (!I_SongPlaying())
|
||||
return;
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
Reference in new issue
Block a user