Merge branch 'master' into release-3.15.3

CBATeam · Mar 9, 2021 · 5ee330d · 5ee330d
2 parents bdad582 + ef20c8c
commit 5ee330d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/addons/xeh/fnc_compileFunction.sqf b/addons/xeh/fnc_compileFunction.sqf
@@ -27,7 +27,7 @@ params [["_funcFile", "", [""]], ["_funcName", "", [""]]];
 private _cachedFunc = uiNamespace getVariable _funcName;
 
 if (isNil "_cachedFunc") then {
-    uiNamespace setVariable [_funcName, compileFinal preprocessFileLineNumbers _funcFile];
+    uiNamespace setVariable [_funcName, compileScript [_funcFile, true]];
     missionNamespace setVariable [_funcName, uiNamespace getVariable _funcName];
 } else {
     if (["compile"] call CBA_fnc_isRecompileEnabled) then {

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 "compile preprocessFileLineNumbers _this"; //backwards comps
+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_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 "compile preprocessFileLineNumbers _this"; //backwards comps
+    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_NEW = CBA_fnc_compileFunction; //backwards comp
 
     PREP(initDisplay3DEN);