simplify

CBATeam · Apr 28, 2016 · 98630d7 · 98630d7
1 parent 5cb3113
commit 98630d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/addons/settings/fnc_forceSetting.sqf b/addons/settings/fnc_forceSetting.sqf
@@ -6,7 +6,7 @@ Description:
 
 Parameters:
     _setting - Name of the setting <STRING>
-    _source  - Can be "server" or "client" (optional, default: "client") <STRING>
+    _force   - true: force, false: release <BOOLEAN>
 
 Returns:
     None
@@ -23,17 +23,10 @@ Author:
 
 if (!isServer) exitWith {};
 
-params [["_setting", "", [""]], ["_source", "client", [""]]];
+params [["_setting", "", [""]], ["_force", true, [false]]];
 
-if (_source == "client") then {
-    missionNamespace setVariable [SETTING_KEY_SERVER_FORCE(_setting), false, true];
-    profileNamespace setVariable [SETTING_KEY_SERVER_FORCE(_setting), false];
-};
-
-if (_source == "server") then {
-    missionNamespace setVariable [SETTING_KEY_SERVER_FORCE(_setting), true, true];
-    profileNamespace setVariable [SETTING_KEY_SERVER_FORCE(_setting), true];
-};
+missionNamespace setVariable [SETTING_KEY_SERVER_FORCE(_setting), _force, true];
+profileNamespace setVariable [SETTING_KEY_SERVER_FORCE(_setting), _force];
 
 // send changed event, because the current active setting could have changed
 [QGVAR(refreshSetting), _setting] call CBA_fnc_globalEvent;

diff --git a/addons/settings/fnc_saveTemporaryData.sqf b/addons/settings/fnc_saveTemporaryData.sqf
@@ -11,7 +11,7 @@
 } forEach allVariables GVAR(settingsTempServer);
 
 {
-    [QGVAR(forceSettingRemote), [_x, ["client", "server"] select (GVAR(settingsForceTempServer) getVariable _x)]] call CBA_fnc_serverEvent;
+    [QGVAR(forceSettingRemote), [_x, GVAR(settingsForceTempServer) getVariable _x]] call CBA_fnc_serverEvent;
 } forEach allVariables GVAR(settingsForceTempServer);
 
 // save mission settings in mission.sqm if they are set as forced

diff --git a/addons/settings/init_settings.sqf b/addons/settings/init_settings.sqf
@@ -61,7 +61,7 @@ if (isNil QGVAR(settingsDefault)) then {
 
             if (isMultiplayer) then {
                 if (profileNamespace getVariable [SETTING_KEY_SERVER_FORCE(_setting), false]) then {
-                    [_setting, "server"] call (uiNamespace getVariable "CBA_fnc_forceSetting");
+                    [_setting, true] call (uiNamespace getVariable "CBA_fnc_forceSetting");
                 };
             };
         } forEach ("true" configClasses _x);