Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

XEH - Use compileScript in CBA_fnc_compileFunction #1422

Merged
merged 2 commits into from
Mar 9, 2021
Merged

XEH - Use compileScript in CBA_fnc_compileFunction #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a5d92f
XEH - Use compileScript in CBA_fnc_compileFunction
PabstMirror Feb 13, 2021
7da9815
Apply suggestions from code review
PabstMirror Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/xeh/fnc_compileFunction.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion addons/xeh/fnc_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion addons/xeh/fnc_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down