From 1cca2db9647788abac503da2471d1f0c994eda6e Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Fri, 31 May 2024 22:20:21 +0200
Subject: [PATCH] General - Cleaned up `cbaSettings_settingChanged` (#10050)

Adapted `cbaSettings_settingChanged`
---
 addons/artillerytables/initSettings.inc.sqf   |  4 +--
 addons/cargo/initSettings.inc.sqf             | 24 +++++----------
 addons/common/XEH_postInit.sqf                |  3 ++
 .../fnc_cbaSettings_settingChanged.sqf        |  8 ++---
 addons/cookoff/initSettings.inc.sqf           | 12 ++------
 addons/csw/initSettings.inc.sqf               |  9 ++----
 addons/fastroping/initSettings.inc.sqf        |  4 +--
 addons/headless/initSettings.inc.sqf          | 18 +++++------
 addons/interact_menu/initSettings.inc.sqf     |  4 +--
 addons/interaction/initSettings.inc.sqf       |  2 +-
 addons/map/initSettings.inc.sqf               | 13 ++------
 addons/microdagr/initSettings.inc.sqf         |  4 +--
 addons/parachute/initSettings.inc.sqf         |  4 +--
 addons/rearm/initSettings.inc.sqf             | 11 +++----
 addons/refuel/initSettings.inc.sqf            | 12 +++-----
 addons/repair/initSettings.inc.sqf            | 30 +++++++------------
 addons/sitting/initSettings.inc.sqf           |  2 +-
 addons/tagging/initSettings.inc.sqf           |  5 +---
 addons/vehicle_damage/initSettings.inc.sqf    |  4 +--
 addons/vehiclelock/initSettings.inc.sqf       |  3 +-
 addons/viewrestriction/initSettings.inc.sqf   | 10 +++----
 addons/volume/initSettings.inc.sqf            | 24 ++-------------
 addons/weaponselect/initSettings.inc.sqf      |  4 +--
 addons/weather/initSettings.inc.sqf           |  3 +-
 24 files changed, 67 insertions(+), 150 deletions(-)

diff --git a/addons/artillerytables/initSettings.inc.sqf b/addons/artillerytables/initSettings.inc.sqf
index 762010b2ca..f34190f910 100644
--- a/addons/artillerytables/initSettings.inc.sqf
+++ b/addons/artillerytables/initSettings.inc.sqf
@@ -15,7 +15,5 @@ private _categoryName = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"
     [LSTRING(disableArtilleryComputer_displayName), LSTRING(disableArtilleryComputer_description)],
     _categoryName,
     false, // default value
-    true, // isGlobal
-    {[QGVAR(disableArtilleryComputer), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    true // isGlobal
 ] call CBA_fnc_addSetting;
diff --git a/addons/cargo/initSettings.inc.sqf b/addons/cargo/initSettings.inc.sqf
index 029a845a25..4f92934d46 100644
--- a/addons/cargo/initSettings.inc.sqf
+++ b/addons/cargo/initSettings.inc.sqf
@@ -6,8 +6,7 @@ private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)];
     [LSTRING(ModuleSettings_enable), LSTRING(ModuleSettings_enable_Description)],
     _category,
     true,
-    1,
-    {[QGVAR(enable), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -16,8 +15,7 @@ private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)];
     [LSTRING(loadTimeCoefficient), LSTRING(loadTimeCoefficient_description)],
     _category,
     [0, 10, 5, 1],
-    1,
-    {[QGVAR(loadTimeCoefficient), _this, true] call EFUNC(common,cbaSettings_settingChanged)}
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -26,8 +24,7 @@ private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)];
     [LSTRING(paradropTimeCoefficent), LSTRING(paradropTimeCoefficent_description)],
     _category,
     [0, 10, 2.5, 1],
-    1,
-    {[QGVAR(paradropTimeCoefficent), _this, true] call EFUNC(common,cbaSettings_settingChanged)}
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -35,9 +32,7 @@ private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)];
     "LIST",
     [LSTRING(openAfterUnload), LSTRING(openAfterUnload_description)],
     _category,
-    [[0, 1, 2, 3], [ELSTRING(common,never), LSTRING(unloadObject), LSTRING(paradropButton), ELSTRING(common,both)], 0],
-    0,
-    {[QGVAR(openAfterUnload), _this, true] call EFUNC(common,cbaSettings_settingChanged)}
+    [[0, 1, 2, 3], [ELSTRING(common,never), LSTRING(unloadObject), LSTRING(paradropButton), ELSTRING(common,both)], 0]
 ] call CBA_fnc_addSetting;
 
 [
@@ -45,9 +40,7 @@ private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)];
     "CHECKBOX",
     [LSTRING(carryAfterUnload), LSTRING(carryAfterUnload_description)],
     _category,
-    true,
-    0,
-    {[QGVAR(carryAfterUnload), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true
 ] call CBA_fnc_addSetting;
 
 [
@@ -56,8 +49,7 @@ private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)];
     [LSTRING(enableDeploy), LSTRING(enableDeploy_description)],
     _category,
     true,
-    1,
-    {[QGVAR(enableDeploy), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -65,7 +57,5 @@ private _category = [ELSTRING(main,Category_Logistics), LSTRING(openMenu)];
     "CHECKBOX",
     [LSTRING(ModuleSettings_enableRename), LSTRING(ModuleSettings_enableRename_Description)],
     _category,
-    true,
-    0,
-    {[QGVAR(enableRename), _this, true] call EFUNC(common,cbaSettings_settingChanged)}
+    true
 ] call CBA_fnc_addSetting;
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index f97009808f..9b11ec49e6 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -222,6 +222,9 @@ if (isServer) then {
     [QGVAR(claimSafe), LINKFUNC(claimSafeServer)] call CBA_fnc_addEventHandler;
 };
 
+["CBA_SettingChanged", {
+    ["ace_settingChanged", _this] call CBA_fnc_localEvent;
+}] call CBA_fnc_addEventHandler;
 
 //////////////////////////////////////////////////
 // Set up remote execution
diff --git a/addons/common/functions/fnc_cbaSettings_settingChanged.sqf b/addons/common/functions/fnc_cbaSettings_settingChanged.sqf
index 43711d4c97..cf9f18166a 100644
--- a/addons/common/functions/fnc_cbaSettings_settingChanged.sqf
+++ b/addons/common/functions/fnc_cbaSettings_settingChanged.sqf
@@ -1,8 +1,8 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Function for handeling a cba setting being changed.
- * Adds warning if global setting is changed after ace_settingsInitialized
+ * Function for handling a cba setting being changed.
+ * Adds warning if global setting is changed after ace_settingsInitialized.
  *
  * Arguments:
  * 0: Setting Name <STRING>
@@ -21,9 +21,7 @@
 params ["_settingName", "_newValue", ["_canBeChanged", false]];
 TRACE_2("",_settingName,_newValue);
 
-["ace_settingChanged", [_settingName, _newValue]] call CBA_fnc_localEvent;
-
-if (!((toLower _settingName) in CBA_settings_needRestart)) exitWith {};
+if !((toLower _settingName) in CBA_settings_needRestart) exitWith {};
 if (_canBeChanged) exitWith {WARNING_1("update cba setting [%1] to use correct Need Restart param",_settingName);};
 if (!GVAR(settingsInitFinished)) exitWith {}; // Ignore changed event before CBA_settingsInitialized
 
diff --git a/addons/cookoff/initSettings.inc.sqf b/addons/cookoff/initSettings.inc.sqf
index 8912636fd6..47f4681365 100644
--- a/addons/cookoff/initSettings.inc.sqf
+++ b/addons/cookoff/initSettings.inc.sqf
@@ -13,9 +13,7 @@
     [LSTRING(enableFire_name), LSTRING(enableFire_tooltip)],
     LSTRING(category_displayName),
     true, // default value
-    true, // isGlobal
-    {[QGVAR(enableFire), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -23,9 +21,7 @@
     [LSTRING(destroyVehicleAfterCookoff_name), LSTRING(destroyVehicleAfterCookoff_tooltip)],
     LSTRING(category_displayName),
     false, // default value
-    true, // isGlobal
-    {[QGVAR(destroyVehicleAfterCookoff), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -33,9 +29,7 @@
     [LSTRING(enableAmmoCookoff_name), LSTRING(enableAmmoCookoff_tooltip)],
     LSTRING(category_displayName),
     true, // default value
-    true, // isGlobal
-    {[QGVAR(enableAmmoCookoff), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/csw/initSettings.inc.sqf b/addons/csw/initSettings.inc.sqf
index de3976896b..bc157e1164 100644
--- a/addons/csw/initSettings.inc.sqf
+++ b/addons/csw/initSettings.inc.sqf
@@ -45,17 +45,12 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
     [LSTRING(progressBarTimeCoefficent_displayName), LSTRING(progressBarTimeCoefficent_description)],
     _categoryArray,
     [0,2,1,2], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
-    true, // isGlobal
-    {[QGVAR(progressBarTimeCoefficent), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
     QGVAR(dragAfterDeploy), "CHECKBOX",
     [LSTRING(dragAfterDeploy_displayName), LSTRING(dragAfterDeploy_description)],
     _categoryArray,
-    false, // default value
-    false, // isGlobal
-    {[QGVAR(dragAfterDeploy), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    false // default value
 ] call CBA_fnc_addSetting;
diff --git a/addons/fastroping/initSettings.inc.sqf b/addons/fastroping/initSettings.inc.sqf
index 844de927a2..cde4a32b47 100644
--- a/addons/fastroping/initSettings.inc.sqf
+++ b/addons/fastroping/initSettings.inc.sqf
@@ -5,9 +5,7 @@ private _category = [LELSTRING(common,categoryUncategorized), LLSTRING(setting_c
     [LSTRING(setting_requireRopeItems_displayName)],
     _category,
     false, // default value
-    true, // isGlobal
-    {[QGVAR(requireRopeItems), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // needRestart
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/headless/initSettings.inc.sqf b/addons/headless/initSettings.inc.sqf
index d00cb6eb30..ec720fce7c 100644
--- a/addons/headless/initSettings.inc.sqf
+++ b/addons/headless/initSettings.inc.sqf
@@ -5,8 +5,8 @@
     format ["ACE %1", LLSTRING(Module)],
     false,
     1,
-    {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    {[QXGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -15,8 +15,7 @@
     [LSTRING(Delay), LSTRING(DelayDesc)],
     format ["ACE %1", LLSTRING(Module)],
     [0, 60, 15, -1],
-    1,
-    {[QGVAR(delay), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -26,8 +25,8 @@
     format ["ACE %1", LLSTRING(Module)],
     [[0, 1, 2], [ELSTRING(Common,Disabled), LSTRING(Instant), LSTRING(Delayed)], 0],
     1,
-    {[QGVAR(delay), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    {[QXGVAR(endMission), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -36,8 +35,7 @@
     [LSTRING(Log), LSTRING(LogDesc)],
     format ["ACE %1", LLSTRING(Module)],
     false,
-    1,
-    {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -47,6 +45,6 @@
     format ["ACE %1", LLSTRING(Module)],
     [[0, 1, 2], [ELSTRING(Common,Disabled), LSTRING(TransferLoadoutCurrent), LSTRING(TransferLoadoutConfig)], 0],
     1,
-    {},
-    true // needs mission restart
+    {[QXGVAR(transferLoadout), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
diff --git a/addons/interact_menu/initSettings.inc.sqf b/addons/interact_menu/initSettings.inc.sqf
index 22287189c3..c175bd17c2 100644
--- a/addons/interact_menu/initSettings.inc.sqf
+++ b/addons/interact_menu/initSettings.inc.sqf
@@ -46,9 +46,7 @@ private _categoryColors = [_category, format ["| %1 |", LELSTRING(common,subcate
     QGVAR(textSize), "LIST",
     LSTRING(textSize),
     _category,
-    [[0, 1, 2, 3, 4], ["str_very_small", "str_small", "str_medium", "str_large", "str_very_large"], 2],
-    0,
-    {[QGVAR(textSize), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    [[0, 1, 2, 3, 4], ["str_very_small", "str_small", "str_medium", "str_large", "str_very_large"], 2]
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/interaction/initSettings.inc.sqf b/addons/interaction/initSettings.inc.sqf
index b502ed36b0..2cefb162a7 100644
--- a/addons/interaction/initSettings.inc.sqf
+++ b/addons/interaction/initSettings.inc.sqf
@@ -20,7 +20,7 @@
     false,
     true,
     {[QGVAR(disableNegativeRating), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/map/initSettings.inc.sqf b/addons/map/initSettings.inc.sqf
index 8de301eaa1..20665b5a71 100644
--- a/addons/map/initSettings.inc.sqf
+++ b/addons/map/initSettings.inc.sqf
@@ -67,14 +67,11 @@
     false,
     true,
     {
-        [QGVAR(BFT_Enabled), _this] call EFUNC(common,cbaSettings_settingChanged);
-
         if (GVAR(BFT_Enabled) && {isNil QGVAR(BFT_markers)}) then {
             GVAR(BFT_markers) = [];
             [LINKFUNC(blueForceTrackingUpdate), GVAR(BFT_Interval), []] call CBA_fnc_addPerFrameHandler;
         };
-    },
-    false
+    }
 ] call CBA_fnc_addSetting;
 
 [
@@ -94,9 +91,7 @@
     [localize LSTRING(BFT_ShowPlayerNames_DisplayName), localize LSTRING(BFT_ShowPlayerNames_Description)],
     [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize LSTRING(BFT_Module_DisplayName)],
     false,
-    true,
-    {[QGVAR(BFT_ShowPlayerNames), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false
+    true
 ] call CBA_fnc_addSetting;
 
 [
@@ -105,7 +100,5 @@
     [localize LSTRING(BFT_HideAiGroups_DisplayName), localize LSTRING(BFT_HideAiGroups_Description)],
     [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize LSTRING(BFT_Module_DisplayName)],
     false,
-    true,
-    {[QGVAR(BFT_HideAiGroups), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false
+    true
 ] call CBA_fnc_addSetting;
diff --git a/addons/microdagr/initSettings.inc.sqf b/addons/microdagr/initSettings.inc.sqf
index 8810939302..aacc5fd24b 100644
--- a/addons/microdagr/initSettings.inc.sqf
+++ b/addons/microdagr/initSettings.inc.sqf
@@ -15,7 +15,5 @@ private _category = [LELSTRING(common,categoryUncategorized), LLSTRING(itemName)
     [LSTRING(WaypointPrecision_DisplayName), LSTRING(WaypointPrecision_Description)],
     _category,
     [[1, 2, 3], [LSTRING(WaypointPrecision_medium), LSTRING(WaypointPrecision_close), LSTRING(WaypointPrecision_exact)], 2],  // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(waypointPrecision), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // require mission restart
+    true // isGlobal
 ] call CBA_fnc_addSetting;
diff --git a/addons/parachute/initSettings.inc.sqf b/addons/parachute/initSettings.inc.sqf
index 0cfc3f8ca0..0c6804cff7 100644
--- a/addons/parachute/initSettings.inc.sqf
+++ b/addons/parachute/initSettings.inc.sqf
@@ -5,9 +5,7 @@ private _category = [LELSTRING(common,categoryUncategorized), localize "str_dn_p
     "CHECKBOX",
     [LSTRING(HideAltimeter), LSTRING(HideAltimeter_tooltip)],
     _category,
-    true,
-    false,
-    {[QGVAR(hideAltimeter), _this, false] call EFUNC(common,cbaSettings_settingChanged)}
+    true
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/rearm/initSettings.inc.sqf b/addons/rearm/initSettings.inc.sqf
index 37535d8d90..6489bd9326 100644
--- a/addons/rearm/initSettings.inc.sqf
+++ b/addons/rearm/initSettings.inc.sqf
@@ -7,7 +7,7 @@ private _category = [ELSTRING(main,Category_Logistics), LLSTRING(DisplayName)];
     true,
     true,
     {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -15,8 +15,7 @@ private _category = [ELSTRING(main,Category_Logistics), LLSTRING(DisplayName)];
     [LSTRING(RearmSettings_level_DisplayName), LSTRING(RearmSettings_level_Description)],
     _category,
     [[0,1,2],[LSTRING(RearmSettings_vehicle), LSTRING(RearmSettings_magazine), LSTRING(RearmSettings_caliber)],0], // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(level), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -24,8 +23,7 @@ private _category = [ELSTRING(main,Category_Logistics), LLSTRING(DisplayName)];
     [LSTRING(RearmSettings_supply_DisplayName), LSTRING(RearmSettings_supply_Description)],
     _category,
     [[0,1,2],[LSTRING(RearmSettings_unlimited), LSTRING(RearmSettings_limited), LSTRING(RearmSettings_magazineSupply)],0], // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(supply), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -33,6 +31,5 @@ private _category = [ELSTRING(main,Category_Logistics), LLSTRING(DisplayName)];
     [LLSTRING(RearmSettings_distance_DisplayName), LLSTRING(RearmSettings_distance_Description)],
     _category,
     [10, 50, 20, 0],
-    true, // isGlobal
-    {[QGVAR(supply), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
diff --git a/addons/refuel/initSettings.inc.sqf b/addons/refuel/initSettings.inc.sqf
index 44df66334f..2888ad190c 100644
--- a/addons/refuel/initSettings.inc.sqf
+++ b/addons/refuel/initSettings.inc.sqf
@@ -15,8 +15,7 @@ private _category = [ELSTRING(main,Category_Logistics), "str_state_refuel"];
     [LSTRING(RefuelSettings_speed_DisplayName), LSTRING(RefuelSettings_speed_Description)],
     _category,
     [0,25,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
-    true, // isGlobal
-    {[QGVAR(rate), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -24,8 +23,7 @@ private _category = [ELSTRING(main,Category_Logistics), "str_state_refuel"];
     [LSTRING(RefuelSettings_speedCargo_DisplayName), LSTRING(RefuelSettings_speedCargo_Description)],
     _category,
     [0,250,10,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
-    true, // isGlobal
-    {[QGVAR(cargoRate), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -33,8 +31,7 @@ private _category = [ELSTRING(main,Category_Logistics), "str_state_refuel"];
     [LSTRING(RefuelSettings_hoseLength_DisplayName)],
     _category,
     [0,50,12,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
-    true, // isGlobal
-    {[QGVAR(hoseLength), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -42,6 +39,5 @@ private _category = [ELSTRING(main,Category_Logistics), "str_state_refuel"];
     [LSTRING(RefuelSettings_progressDuration_DisplayName), LSTRING(RefuelSettings_progressDuration_Description)],
     _category,
     [0, 10, 2], // [min, max, default value]
-    true, // isGlobal
-    {[QGVAR(progressDuration), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
diff --git a/addons/repair/initSettings.inc.sqf b/addons/repair/initSettings.inc.sqf
index 26d502e757..e39bb93a76 100644
--- a/addons/repair/initSettings.inc.sqf
+++ b/addons/repair/initSettings.inc.sqf
@@ -8,16 +8,14 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     true,
     true,
     {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
     QGVAR(displayTextOnRepair), "CHECKBOX",
     [LSTRING(SettingDisplayTextName), LSTRING(SettingDisplayTextDesc)],
     _category,
-    true, // default value
-    false, // isGlobal
-    {[QGVAR(displayTextOnRepair), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // default value
 ] call CBA_fnc_addSetting;
 
 [
@@ -25,8 +23,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(engineerSetting_Repair_name), LSTRING(engineerSetting_Repair_description)],
     _category,
     [[0,1,2],[LSTRING(engineerSetting_anyone), LSTRING(engineerSetting_EngineerOnly), LSTRING(engineerSetting_AdvancedOnly)],1], // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(engineerSetting_repair), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -34,8 +31,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(engineerSetting_Wheel_name), LSTRING(engineerSetting_Wheel_description)],
     _category,
     [[0,1,2],[LSTRING(engineerSetting_anyone), LSTRING(engineerSetting_EngineerOnly), LSTRING(engineerSetting_AdvancedOnly)],0], // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(engineerSetting_wheel), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -69,8 +65,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(repairDamageThreshold_name), LSTRING(repairDamageThreshold_description)],
     _category,
     [0, 1, 0.6, 1, true],
-    true, // isGlobal
-    {[QGVAR(repairDamageThreshold), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -78,8 +73,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(repairDamageThreshold_Engineer_name), LSTRING(repairDamageThreshold_Engineer_description)],
     _category,
     [0, 1, 0.4, 1, true],
-    true, // isGlobal
-    {[QGVAR(repairDamageThreshold_engineer), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -87,8 +81,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(consumeItem_ToolKit_name), LSTRING(consumeItem_ToolKit_description)],
     _category,
     [[0,1],[ELSTRING(common,No), ELSTRING(common,Yes)],0], // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(consumeItem_toolKit), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -105,8 +98,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(fullRepairLocation), LSTRING(fullRepairLocation_description)],
     _catFullRepair,
     [[0,1,2,3,4],[LSTRING(useAnywhere), LSTRING(repairVehicleOnly), LSTRING(repairFacilityOnly), LSTRING(vehicleAndFacility), ELSTRING(common,Disabled)],2], // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(fullRepairLocation), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -114,8 +106,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(engineerSetting_fullRepair_name), LSTRING(engineerSetting_fullRepair_description)],
     _catFullRepair,
     [[0,1,2],[LSTRING(engineerSetting_anyone), LSTRING(engineerSetting_EngineerOnly), LSTRING(engineerSetting_AdvancedOnly)],2], // [values, titles, defaultIndex]
-    true, // isGlobal
-    {[QGVAR(engineerSetting_fullRepair), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
@@ -168,8 +159,7 @@ private _catFullRepair = [_category, LLSTRING(fullRepair)];
     [LSTRING(autoShutOffEngineWhenStartingRepair_name), LSTRING(autoShutOffEngineWhenStartingRepair_description)],
     _category,
     false, // default value
-    true, // isGlobal
-    {[QGVAR(autoShutOffEngineWhenStartingRepair), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/sitting/initSettings.inc.sqf b/addons/sitting/initSettings.inc.sqf
index 744c188e9f..ee1af1ec8e 100644
--- a/addons/sitting/initSettings.inc.sqf
+++ b/addons/sitting/initSettings.inc.sqf
@@ -6,5 +6,5 @@
     true,
     true,
     {[QGVAR(enable), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
diff --git a/addons/tagging/initSettings.inc.sqf b/addons/tagging/initSettings.inc.sqf
index 4fc35b83d1..e05146c081 100644
--- a/addons/tagging/initSettings.inc.sqf
+++ b/addons/tagging/initSettings.inc.sqf
@@ -4,8 +4,5 @@ private _category = [LELSTRING(common,categoryUncategorized), LLSTRING(Tagging)]
     QGVAR(quickTag), "LIST",
     [LLSTRING(QuickTag), LLSTRING(QuickTagDesc)],
     _category,
-    [[0,1,2,3], [LELSTRING(Common,Disabled), LLSTRING(LastUsed), LLSTRING(RandomX), LLSTRING(Random)], 1], // [values, titles, defaultIndex]
-    false, // isGlobal
-    {[QGVAR(quickTag), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    [[0,1,2,3], [LELSTRING(Common,Disabled), LLSTRING(LastUsed), LLSTRING(RandomX), LLSTRING(Random)], 1] // [values, titles, defaultIndex]
 ] call CBA_fnc_addSetting;
diff --git a/addons/vehicle_damage/initSettings.inc.sqf b/addons/vehicle_damage/initSettings.inc.sqf
index ae322a6fd8..5841145cf9 100644
--- a/addons/vehicle_damage/initSettings.inc.sqf
+++ b/addons/vehicle_damage/initSettings.inc.sqf
@@ -13,9 +13,7 @@
     [LSTRING(removeAmmoAfterCookoff_setting_enable), LSTRING(removeAmmoAfterCookoff_setting_description)],
     LSTRING(category_displayName),
     true, // default value
-    true, // isGlobal
-    {[QGVAR(removeAmmoDuringCookoff), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false // Needs mission restart
+    true // isGlobal
 ] call CBA_settings_fnc_init;
 
 [
diff --git a/addons/vehiclelock/initSettings.inc.sqf b/addons/vehiclelock/initSettings.inc.sqf
index 9f68c77e7c..dcb520e7e2 100644
--- a/addons/vehiclelock/initSettings.inc.sqf
+++ b/addons/vehiclelock/initSettings.inc.sqf
@@ -3,8 +3,7 @@
     [LSTRING(DefaultLockpickStrength_DisplayName), LSTRING(DefaultLockpickStrength_Description)],
     LSTRING(DisplayName),
     [-1,60,10,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
-    true, // isGlobal
-    {[QGVAR(defaultLockpickStrength), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // isGlobal
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/viewrestriction/initSettings.inc.sqf b/addons/viewrestriction/initSettings.inc.sqf
index 3ed47c10ef..80382f5b19 100644
--- a/addons/viewrestriction/initSettings.inc.sqf
+++ b/addons/viewrestriction/initSettings.inc.sqf
@@ -6,7 +6,7 @@
     [[0, 1, 2, 3], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson), LSTRING(Selective)], 0],
     true,
     {[QGVAR(mode), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -17,7 +17,7 @@
     [[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
     true,
     {[QGVAR(modeSelectiveFoot), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -28,7 +28,7 @@
     [[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
     true,
     {[QGVAR(modeSelectiveLand), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -39,7 +39,7 @@
     [[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
     true,
     {[QGVAR(modeSelectiveAir), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -50,7 +50,7 @@
     [[0, 1, 2], [LSTRING(Disabled), LSTRING(FirstPerson), LSTRING(ThirdPerson)], 0],
     true,
     {[QGVAR(modeSelectiveSea), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/volume/initSettings.inc.sqf b/addons/volume/initSettings.inc.sqf
index 8735f81527..44bb464a1e 100644
--- a/addons/volume/initSettings.inc.sqf
+++ b/addons/volume/initSettings.inc.sqf
@@ -3,9 +3,6 @@
     "CHECKBOX",
     [ELSTRING(common,Enabled), LSTRING(KeybindDescription)],
     format ["ACE %1", LLSTRING(Name)],
-    false,
-    false,
-    {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false
 ] call CBA_fnc_addSetting;
 
@@ -14,10 +11,7 @@
     "LIST",
     [LSTRING(Reduction), LSTRING(ReductionDescription)],
     format ["ACE %1", LLSTRING(Name)],
-    [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0%", "10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", "90%", "100%"], 5],
-    false,
-    {[QGVAR(reduction), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false
+    [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0%", "10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", "90%", "100%"], 5]
 ] call CBA_fnc_addSetting;
 
 [
@@ -25,10 +19,7 @@
     "LIST",
     [LSTRING(FadeDelay), LSTRING(FadeDelayDescription)],
     format ["ACE %1", LLSTRING(Name)],
-    [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0s", "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s", "9s", "10s"], 1],
-    false,
-    {[QGVAR(fadeDelay), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false
+    [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], ["0s", "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s", "9s", "10s"], 1]
 ] call CBA_fnc_addSetting;
 
 [
@@ -36,9 +27,6 @@
     "CHECKBOX",
     [LSTRING(LowerInVehicles), LSTRING(LowerInVehiclesDescription)],
     format ["ACE %1", LLSTRING(Name)],
-    false,
-    false,
-    {[QGVAR(lowerInVehicles), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false
 ] call CBA_fnc_addSetting;
 
@@ -47,10 +35,7 @@
     "CHECKBOX",
     [LSTRING(ShowNotification), LSTRING(ShowNotificationDescription)],
     format ["ACE %1", LLSTRING(Name)],
-    true,
-    false,
-    {[QGVAR(showNotification), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    false
+    true
 ] call CBA_fnc_addSetting;
 
 [
@@ -58,8 +43,5 @@
     "CHECKBOX",
     [LSTRING(RemindIfLowered), LSTRING(RemindIfLoweredDescription)],
     format ["ACE %1", LLSTRING(Name)],
-    false,
-    false,
-    {[QGVAR(remindIfLowered), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false
 ] call CBA_fnc_addSetting;
diff --git a/addons/weaponselect/initSettings.inc.sqf b/addons/weaponselect/initSettings.inc.sqf
index 029c5201cb..f5695748b4 100644
--- a/addons/weaponselect/initSettings.inc.sqf
+++ b/addons/weaponselect/initSettings.inc.sqf
@@ -2,7 +2,5 @@
     QGVAR(displayText), "CHECKBOX",
     [LSTRING(SettingDisplayTextName), LSTRING(SettingDisplayTextDesc)],
     ELSTRING(common,ACEKeybindCategoryWeapons),
-    true, // default value
-    false, // isGlobal
-    {[QGVAR(displayText), _this] call EFUNC(common,cbaSettings_settingChanged)}
+    true // default value
 ] call CBA_fnc_addSetting;
diff --git a/addons/weather/initSettings.inc.sqf b/addons/weather/initSettings.inc.sqf
index fb11e31e75..26f4442084 100644
--- a/addons/weather/initSettings.inc.sqf
+++ b/addons/weather/initSettings.inc.sqf
@@ -34,6 +34,5 @@ private _category = [format ["ACE %1", LLSTRING(Module_DisplayName)]];
     QGVAR(showCheckAirTemperature), "CHECKBOX",
     [LSTRING(showCheckAirTemperature_DisplayName), LELSTRING(common,showActionInSelfInteraction)],
     _category,
-    true, // default value
-    false // isGlobal
+    true // default value
 ] call CBA_fnc_addSetting;