Merge branch 'master' of https://github.com/fishykins/ACE3 into fishykins-master

This commit is contained in:
commy2 2018-01-02 14:37:13 +01:00
commit 6dec4c8259
2 changed files with 5 additions and 1 deletions

View File

@ -27,6 +27,8 @@ GVAR(statusEffect_isGlobal) = [];
GVAR(setHearingCapabilityMap) = [];
GVAR(setMusicVolume) = true;
//////////////////////////////////////////////////
// Set up PlayerChanged eventhandler for pre init (EH is installed in postInit)
//////////////////////////////////////////////////

View File

@ -47,7 +47,9 @@ if (!_exists && _add) then {
// in game sounds
0 fadeSound _lowestVolume;
0 fadeRadio _lowestVolume;
0 fadeMusic _lowestVolume;
if (GVAR(setMusicVolume)) then {
0 fadeMusic _lowestVolume;
};
// Set Radio mod variables.
ACE_player setVariable ["tf_globalVolume", _lowestVolume];