Merge branch 'master' into release-3.15.4

CBATeam · Jun 30, 2021 · 7fc4f34 · 7fc4f34
2 parents 9c26649 + da45390
commit 7fc4f34
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/addons/diagnostic/fnc_initExtendedDebugConsole.sqf b/addons/diagnostic/fnc_initExtendedDebugConsole.sqf
@@ -57,7 +57,7 @@ _expression ctrlAddEventHandler ["KeyDown", {
                 [ctrlParent _buttonLocalExec, _buttonLocalExec],
                 "RscDisplayDebugPublic",
                 0
-            ] call compile preprocessFileLineNumbers "\A3\Ui_f\scripts\GUI\RscDebugConsole.sqf";
+            ] call compileScript ["\A3\Ui_f\scripts\GUI\RscDebugConsole.sqf"];
 
             playSound "SoundClick";
         };

diff --git a/addons/ui/test_preload.sqf b/addons/ui/test_preload.sqf
@@ -9,7 +9,7 @@ isNil {
     with uiNamespace do {
         // 3DEN
         AmmoBox_list = nil;
-        ["onLoad", [controlNull]] call compile preprocessFile "\a3\3den\UI\Attributes\AmmoBox.sqf";
+        ["onLoad", [controlNull]] call compileScript ["\a3\3den\UI\Attributes\AmmoBox.sqf"];
     };
 };
 
@@ -47,13 +47,13 @@ isNil {
         _curator addCuratorAddons call EGVAR(common,addons);
 
         missionNamespace setVariable ["RscAttrbuteInventory_weaponAddons", nil];
-        ["onLoad", [displayNull], objNull] call compile preprocessFile "\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf";
+        ["onLoad", [displayNull], objNull] call compileScript ["\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf"];
         _vanilla = RscAttributeInventory_list;
 
         GVAR(curatorItemCache) = nil;
         call FUNC(preloadCurator);
         missionNamespace setVariable ["RscAttrbuteInventory_weaponAddons", GVAR(curatorItemCache)];
-        ["onLoad", [displayNull], objNull] call compile preprocessFile "\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf";
+        ["onLoad", [displayNull], objNull] call compileScript ["\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf"];
         _cba = RscAttributeInventory_list;
 
         TEST_TRUE([_vanilla] isEqualTo [_cba],QFUNC(preloadCurator));

diff --git a/addons/xeh/fnc_preInit.sqf b/addons/xeh/fnc_preInit.sqf
@@ -26,7 +26,7 @@ SLX_XEH_DisableLogging = uiNamespace getVariable ["SLX_XEH_DisableLogging", fals
 XEH_LOG("PreInit started. v" + getText (configFile >> "CfgPatches" >> "cba_common" >> "versionStr"));
 
 SLX_XEH_STR = ""; // does nothing, never changes, backwards compatibility
-SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compile preprocessFileLineNumbers _this"; //backwards compat
+SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compileScript [_this]"; //backwards compat
 SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction; //backwards comp
 SLX_XEH_DUMMY = "Logic"; // backwards comp
 

diff --git a/addons/xeh/fnc_preStart.sqf b/addons/xeh/fnc_preStart.sqf
@@ -23,7 +23,7 @@ with uiNamespace do {
 
     XEH_LOG("PreStart started.");
 
-    SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compile preprocessFileLineNumbers _this"; //backwards compat
+    SLX_XEH_COMPILE = compileFinal "diag_log text format ['[CBA-XEH] old SLX_XEH_COMPILE macro used on %1', _this]; compileScript [_this]"; //backwards compat
     SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction; //backwards comp
 
     PREP(initDisplay3DEN);