Add config property that can make settings changes stay until restart

CBATeam · Oct 12, 2023 · 5404e3e · 5404e3e
1 parent 0e49144
commit 5404e3e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/addons/settings/fnc_clear.sqf b/addons/settings/fnc_clear.sqf
@@ -77,7 +77,7 @@ switch (toLower _source) do {
     case "server": {
         if (!isServer) exitWith {};
 
-        profileNamespace setVariable [QGVAR(hash), HASH_NULL];
+        GVAR(serverHashNamespace) setVariable [QGVAR(hash), HASH_NULL];
         saveProfileNamespace;
         GVAR(client) call CBA_fnc_deleteNamespace;
         GVAR(client) = [] call CBA_fnc_createNamespace;

diff --git a/addons/settings/fnc_init.sqf b/addons/settings/fnc_init.sqf
@@ -166,7 +166,7 @@ GVAR(default) setVariable [_setting, [_defaultValue, _setting, _settingType, _se
 private _settingInfo = GVAR(userconfig) getVariable _setting;
 
 if (isNil "_settingInfo") then {
-    private _settingsHash = profileNamespace getVariable [QGVAR(hash), HASH_NULL];
+    private _settingsHash = GVAR(serverHashNamespace) getVariable [QGVAR(hash), HASH_NULL];
     _settingInfo = [_settingsHash, toLower _setting] call CBA_fnc_hashGet;
 };
 

diff --git a/addons/settings/fnc_initDisplayMain.sqf b/addons/settings/fnc_initDisplayMain.sqf
@@ -28,6 +28,12 @@ if (_file != "") then {
 
 uiNamespace setVariable [QGVAR(userconfig), compileFinal str _userconfig];
 
+private _volatile = getNumber (configFile >> QGVAR(volatile)) == 1;
+uiNamespace setVariable [QGVAR(volatile), _volatile];
+if (_volatile) then {
+    WARNING("Server settings changes will be lost upon game restart.");
+};
+
 private _ctrlAddonOptions = _display displayCtrl IDC_MAIN_ADDONOPTIONS;
 
 if (isNil QUOTE(ADDON)) then {

diff --git a/addons/settings/fnc_set.sqf b/addons/settings/fnc_set.sqf
@@ -118,15 +118,15 @@ switch (toLower _source) do {
                 private _defaultValue = [_setting, "default"] call FUNC(get);
                 private _defaultPriority = SANITIZE_PRIORITY(_setting,0,_source);
 
-                private _settingsHash = profileNamespace getVariable [QGVAR(hash), HASH_NULL];
+                private _settingsHash = GVAR(serverHashNamespace) getVariable [QGVAR(hash), HASH_NULL];
 
                 if ([_value, _priority] isEqualTo [_defaultValue, _defaultPriority]) then {
                     [_settingsHash, toLower _setting] call CBA_fnc_hashRem;
                 } else {
                     [_settingsHash, toLower _setting, [_value, _priority]] call CBA_fnc_hashSet;
                 };
 
-                profileNamespace setVariable [QGVAR(hash), _settingsHash];
+                GVAR(serverHashNamespace) setVariable [QGVAR(hash), _settingsHash];
                 saveProfileNamespace;
             };
 

diff --git a/addons/settings/initSettings.sqf b/addons/settings/initSettings.sqf
@@ -10,6 +10,9 @@ if (isNil QGVAR(default)) then {
 
     if (isNil QGVAR(server)) then {
         GVAR(server) = NAMESPACE_NULL;
+
+        private _volatile = uiNamespace getVariable QGVAR(volatile);
+        GVAR(serverHashNamespace) = [profileNamespace, uiNamespace] select _volatile;
     };
 
     if (isServer) then {

diff --git a/template/cba_settings_userconfig/config.cpp b/template/cba_settings_userconfig/config.cpp
@@ -12,3 +12,6 @@ class CfgPatches {
         authors[] = {"commy2"};
     };
 };
+
+// Uncommenting this will make any changes to "Server" settings be lost upon game restart
+// cba_settings_volatile = 1;