zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

sounds.c: do S_MusicVolume() in S_SoundStartup().

Browse source 
This fixes this initialization issue:
http://forums.duke4.net/topic/7144-midi-volume-weirdness/

git-svn-id: https://svn.eduke32.com/eduke32@4289 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-02-01 16:19:58 +00:00
parent f7035da876
commit f04ec9e117
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/source/menus.c
View file

@ -4578,8 +4578,8 @@ cheat_for_port_credits2:
sliderbar(1, d+8, yy+7, &ud.config.MasterVolume, 15, probey==io, enabled ? MENUHIGHLIGHT(io) : UNSELMENUSHADE, !enabled, 0, 255); sliderbar(1, d+8, yy+7, &ud.config.MasterVolume, 15, probey==io, enabled ? MENUHIGHLIGHT(io) : UNSELMENUSHADE, !enabled, 0, 255);
if (l != ud.config.MasterVolume) if (l != ud.config.MasterVolume)
{ {
FX_SetVolume((int16_t) ud.config.MasterVolume); FX_SetVolume(ud.config.MasterVolume);
S_MusicVolume((int16_t) MASTER_VOLUME(ud.config.MusicVolume)); S_MusicVolume(MASTER_VOLUME(ud.config.MusicVolume));
} }
} }
break; break;
@ -4597,7 +4597,7 @@ cheat_for_port_credits2:
l = ud.config.MusicVolume; l = ud.config.MusicVolume;
sliderbar(1,d+8,yy+7, &ud.config.MusicVolume,15,probey==io,enabled?MENUHIGHLIGHT(io):UNSELMENUSHADE,!enabled,0,255); sliderbar(1,d+8,yy+7, &ud.config.MusicVolume,15,probey==io,enabled?MENUHIGHLIGHT(io):UNSELMENUSHADE,!enabled,0,255);
if (l != ud.config.MusicVolume) if (l != ud.config.MusicVolume)
S_MusicVolume((int16_t) MASTER_VOLUME(ud.config.MusicVolume)); S_MusicVolume(MASTER_VOLUME(ud.config.MusicVolume));
} }
break; break;
case 4: case 4:

2
polymer/eduke32/source/sounds.c
View file

@ -88,6 +88,8 @@ void S_SoundStartup(void)
} }
FX_SetVolume(ud.config.MasterVolume); FX_SetVolume(ud.config.MasterVolume);
S_MusicVolume(MASTER_VOLUME(ud.config.MusicVolume));
FX_SetReverseStereo(ud.config.ReverseStereo); FX_SetReverseStereo(ud.config.ReverseStereo);
FX_SetCallBack(S_Callback); FX_SetCallBack(S_Callback);
FX_SetPrintf(initprintf); FX_SetPrintf(initprintf);