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

Volume fixes

Browse source 
# Conflicts:
#	src/sdl/mixer_sound.c

(cherry picked from commit d39b7011c5)
This commit is contained in:
mazmazz 2018-08-24 18:01:57 -04:00
parent 2fbe206ecb
commit 5f22b7d973
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/s_sound.c
View file

@ -1465,11 +1465,13 @@ void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume)
switch(I_SongType()) switch(I_SongType())
{ {
case MU_MID: case MU_MID:
case MU_MOD: //case MU_MOD:
case MU_GME: //case MU_GME:
I_SetMusicVolume(seqvolume&31); I_SetMusicVolume(seqvolume&31);
break;
default: default:
I_SetMusicVolume(digvolume&31); I_SetMusicVolume(digvolume&31);
break;
} }
} }

2
src/sdl/mixer_sound.c
View file

@ -769,7 +769,7 @@ void I_ResumeSong(void)
void I_SetMusicVolume(UINT8 volume) void I_SetMusicVolume(UINT8 volume)
{ {
if (!music) if (!I_SongPlaying())
return; return;
#ifdef _WIN32 #ifdef _WIN32