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

XEH - Fix CBA fncs not available in editor when using RECOMPILE macro #1337

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −0
Open

XEH - Fix CBA fncs not available in editor when using RECOMPILE macro #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions addons/jr/CfgFunctions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class CfgFunctions {
class compatibleItems {
description = "Get list of compatible attachments for a weapon";
file = QPATHTOF(fnc_compatibleItems.sqf);
RECOMPILE;
};
};
};
Expand Down
2 changes: 2 additions & 0 deletions addons/xeh/CfgFunctions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ class CfgFunctions {
class preInit {
preInit = 1;
file = PATHTOF(fnc_preInit.sqf);
// This file cannot be recompiled or it will be undefined at preInit
};
class postInit {
postInit = 1;
file = PATHTOF(fnc_postInit.sqf);
RECOMPILE;
};
};
};
Expand Down
12 changes: 12 additions & 0 deletions addons/xeh/fnc_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ SLX_XEH_DisableLogging = uiNamespace getVariable ["SLX_XEH_DisableLogging", fals

XEH_LOG("PreInit started. v" + getText (configFile >> "CfgPatches" >> "cba_common" >> "versionStr"));

#ifdef RECOMPILE
if (isNil "CBA_fnc_compileFunction") then {
INFO("Recompiling all CBA Functions [for use in threeden]");
{
{
private _fncName = format ["CBA_fnc_%1", configName _x];
_fncName call BIS_fnc_recompile;
} forEach (configProperties [_x]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before you change this, can this config or the super config contain any other tokens besides classes? Looks like it according to https://community.bistudio.com/wiki/Arma_3_Functions_Library. Though we likely not make use of them.

} forEach (configProperties [configFile >> "CfgFunctions" >> "CBA"]);
};
#endif

SLX_XEH_STR = ""; // does nothing, never changes, backwards compatibility
SLX_XEH_COMPILE = compileFinal "compile preprocessFileLineNumbers _this"; //backwards comps
SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction; //backwards comp
Expand Down