From 3e9f6e77eb5ee1678162583c7ece41343da8a8d3 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 15 Oct 2024 18:00:18 +0200
Subject: [PATCH] General - Replaced `ace_settingsInitialized` wherever
 possible (#10402)

Replaced ace_settingsInitialized wherever possible
---
 addons/common/XEH_postInit.sqf                             | 2 +-
 addons/common/functions/fnc_cbaSettings.sqf                | 2 +-
 addons/common/functions/fnc_cbaSettings_settingChanged.sqf | 2 +-
 addons/field_rations/XEH_postInit.sqf                      | 2 +-
 addons/sitting/XEH_clientInit.sqf                          | 2 +-
 addons/viewrestriction/XEH_clientInit.sqf                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 98520aef937..8ea36661712 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -294,7 +294,7 @@ call FUNC(checkFiles);
 
 
 //////////////////////////////////////////////////
-// Set up ace_settingsInitialized eventhandler
+// Set up CBA_settingsInitialized eventhandler
 //////////////////////////////////////////////////
 
 ["CBA_settingsInitialized", {
diff --git a/addons/common/functions/fnc_cbaSettings.sqf b/addons/common/functions/fnc_cbaSettings.sqf
index bd23fef6976..fbba25b579b 100644
--- a/addons/common/functions/fnc_cbaSettings.sqf
+++ b/addons/common/functions/fnc_cbaSettings.sqf
@@ -58,7 +58,7 @@ GVAR(settingsMovedToSQF) = [];
     if !(SLX_XEH_MACHINE select 8) then {WARNING("PostInit not finished");};
     INFO("Settings initialized.");
 
-    //Event that settings are safe to use:
+    //Event that settings are safe to use, kept for BWC
     ["ace_settingsInitialized", []] call CBA_fnc_localEvent;
 
     //Set init finished and run all delayed functions:
diff --git a/addons/common/functions/fnc_cbaSettings_settingChanged.sqf b/addons/common/functions/fnc_cbaSettings_settingChanged.sqf
index cf9f18166ab..d819aa05bc0 100644
--- a/addons/common/functions/fnc_cbaSettings_settingChanged.sqf
+++ b/addons/common/functions/fnc_cbaSettings_settingChanged.sqf
@@ -2,7 +2,7 @@
 /*
  * Author: PabstMirror
  * Function for handling a cba setting being changed.
- * Adds warning if global setting is changed after ace_settingsInitialized.
+ * Adds warning if global setting is changed after CBA_settingsInitialized.
  *
  * Arguments:
  * 0: Setting Name <STRING>
diff --git a/addons/field_rations/XEH_postInit.sqf b/addons/field_rations/XEH_postInit.sqf
index 9fc8406abaf..54feeef659f 100644
--- a/addons/field_rations/XEH_postInit.sqf
+++ b/addons/field_rations/XEH_postInit.sqf
@@ -2,7 +2,7 @@
 
 if !(hasInterface) exitWith {};
 
-["ace_settingsInitialized", {
+["CBA_settingsInitialized", {
     // Exit if not enabled
     if (!XGVAR(enabled)) exitWith {};
 
diff --git a/addons/sitting/XEH_clientInit.sqf b/addons/sitting/XEH_clientInit.sqf
index 5495ef0e978..bb2b1e2e681 100644
--- a/addons/sitting/XEH_clientInit.sqf
+++ b/addons/sitting/XEH_clientInit.sqf
@@ -3,7 +3,7 @@
 // Exit on Headless
 if (!hasInterface) exitWith {};
 
-["ace_settingsInitialized", {
+["CBA_settingsInitialized", {
     TRACE_1("SettingInit",XGVAR(enable));
 
     // If not enabled, then do not add CanInteractWith Condition or event handlers
diff --git a/addons/viewrestriction/XEH_clientInit.sqf b/addons/viewrestriction/XEH_clientInit.sqf
index 1ed4f008dad..08cc520fd70 100644
--- a/addons/viewrestriction/XEH_clientInit.sqf
+++ b/addons/viewrestriction/XEH_clientInit.sqf
@@ -3,7 +3,7 @@
 // Exit on Headless Client
 if !(hasInterface) exitWith {};
 
-["ace_settingsInitialized", {
+["CBA_settingsInitialized", {
     // Exit if module is disabled
     if (XGVAR(mode) == 0) exitWith {};