stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 06:00:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Volume fixes

Browse source
This commit is contained in:
mazmazz 2018-08-24 17:43:20 -04:00
parent bf4e7d2dd6
commit a688de5dc2
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/s_sound.c
View file

@ -1518,7 +1518,6 @@ static boolean S_PlayMusic(boolean looping, UINT32 fadeinms)
return false; return false;
} }
S_InitMusicVolume(); // switch between digi and sequence volume S_InitMusicVolume(); // switch between digi and sequence volume
return true; return true;
} }
@ -1684,11 +1683,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;
} }
} }

4
src/sdl/mixer_sound.c
View file

@ -1197,7 +1197,7 @@ void I_ResumeSong()
void I_SetMusicVolume(UINT8 volume) void I_SetMusicVolume(UINT8 volume)
{ {
if (!music) if (!I_SongPlaying())
return; return;
#ifdef _WIN32 #ifdef _WIN32
@ -1253,7 +1253,7 @@ boolean I_SetSongTrack(int track)
void I_SetInternalMusicVolume(UINT8 volume) void I_SetInternalMusicVolume(UINT8 volume)
{ {
internal_volume = volume; internal_volume = volume;
if (!music) if (!I_SongPlaying())
return; return;
Mix_VolumeMusic(get_real_volume(music_volume)); Mix_VolumeMusic(get_real_volume(music_volume));
} }