Merge pull request #464 from CBATeam/precompile-display-load-functions

precompile all display load functions
CBATeam · Aug 15, 2016 · 219d289 · 219d289
2 parents 90463a1 + 0881a91
commit 219d289
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 12 deletions.
diff --git a/addons/events/CfgEventHandlers.hpp b/addons/events/CfgEventHandlers.hpp
@@ -19,9 +19,9 @@ class Extended_PostInit_EventHandlers {
 
 class Extended_DisplayLoad_EventHandlers {
     class RscDisplayMission {
-        ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
+        ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(missionDisplayLoad)'));
     };
     class RscDisplayCurator {
-        ADDON = QUOTE(_this call COMPILE_FILE(XEH_curatorDisplayLoad));
+        ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(curatorDisplayLoad)'));
     };
 };
diff --git a/addons/events/XEH_preStart.sqf b/addons/events/XEH_preStart.sqf
@@ -3,3 +3,6 @@
 PREP(keyHandler);
 PREP(keyHandlerDown);
 PREP(keyHandlerUp);
+
+PREP(missionDisplayLoad);
+PREP(curatorDisplayLoad);
diff --git a/addons/events/XEH_curatorDisplayLoad.sqf → addons/events/fnc_curatorDisplayLoad.sqf b/addons/events/XEH_curatorDisplayLoad.sqf → addons/events/fnc_curatorDisplayLoad.sqf
diff --git a/addons/events/XEH_missionDisplayLoad.sqf → addons/events/fnc_missionDisplayLoad.sqf b/addons/events/XEH_missionDisplayLoad.sqf → addons/events/fnc_missionDisplayLoad.sqf
diff --git a/addons/help/CfgEventhandlers.hpp b/addons/help/CfgEventhandlers.hpp
@@ -1,4 +1,10 @@
 
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
     class ADDON {
         clientInit = QUOTE(call COMPILE_FILE(XEH_preClientInit));
@@ -13,15 +19,15 @@ class Extended_PostInit_EventHandlers {
 
 class Extended_DisplayLoad_EventHandlers {
     class RscDisplayMain {
-        CBA_helpVersion = QUOTE(_this call COMPILE_FILE(fnc_setVersionLine));
-        CBA_helpCredits = QUOTE(_this call COMPILE_FILE(fnc_setCreditsLine));
+        CBA_helpVersion = QUOTE(_this call (uiNamespace getVariable 'FUNC(setVersionLine)'));
+        CBA_helpCredits = QUOTE(_this call (uiNamespace getVariable 'FUNC(setCreditsLine)'));
     };
     class RscDisplayInterrupt {
-        CBA_helpVersion = QUOTE(_this call COMPILE_FILE(fnc_setVersionLine));
-        CBA_helpCredits = QUOTE(_this call COMPILE_FILE(fnc_setCreditsLine));
+        CBA_helpVersion = QUOTE(_this call (uiNamespace getVariable 'FUNC(setVersionLine)'));
+        CBA_helpCredits = QUOTE(_this call (uiNamespace getVariable 'FUNC(setCreditsLine)'));
     };
     class RscDisplayMPInterrupt {
-        CBA_helpVersion = QUOTE(_this call COMPILE_FILE(fnc_setVersionLine));
-        CBA_helpCredits = QUOTE(_this call COMPILE_FILE(fnc_setCreditsLine));
+        CBA_helpVersion = QUOTE(_this call (uiNamespace getVariable 'FUNC(setVersionLine)'));
+        CBA_helpCredits = QUOTE(_this call (uiNamespace getVariable 'FUNC(setCreditsLine)'));
     };
 };
diff --git a/addons/help/XEH_preStart.sqf b/addons/help/XEH_preStart.sqf
@@ -0,0 +1,4 @@
+#include "script_component.hpp"
+
+PREP(setVersionLine);
+PREP(setCreditsLine);
diff --git a/addons/keybinding/CfgEventHandlers.hpp b/addons/keybinding/CfgEventHandlers.hpp
@@ -1,4 +1,10 @@
 
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_FILE(XEH_preInit));
@@ -7,6 +13,6 @@ class Extended_PreInit_EventHandlers {
 
 class Extended_DisplayLoad_EventHandlers {
     class RscDisplayConfigure {
-        ADDON = QUOTE(_this call COMPILE_FILE(XEH_configureDisplayLoad));
+        ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(configureDisplayLoad)'));
     };
 };
diff --git a/addons/keybinding/XEH_preStart.sqf b/addons/keybinding/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+PREP(configureDisplayLoad);
diff --git a/...s/keybinding/XEH_configureDisplayLoad.sqf → ...s/keybinding/fnc_configureDisplayLoad.sqf b/...s/keybinding/XEH_configureDisplayLoad.sqf → ...s/keybinding/fnc_configureDisplayLoad.sqf
diff --git a/addons/settings/CfgEventHandlers.hpp b/addons/settings/CfgEventHandlers.hpp
@@ -19,9 +19,9 @@ class Extended_PostInit_EventHandlers {
 
 class Extended_DisplayLoad_EventHandlers {
     class RscDisplayGameOptions {
-        ADDON = QUOTE(if (isNil 'ADDON') then {_this call COMPILE_FILE(gui_initDisplay_disabled)} else {_this call COMPILE_FILE(gui_initDisplay)};);
+        ADDON = QUOTE(if (isNil 'ADDON') then {_this call (uiNamespace getVariable 'FUNC(gui_initDisplay_disabled)')} else {_this call (uiNamespace getVariable 'FUNC(gui_initDisplay)')};);
     };
     class Display3DEN {
-        ADDON = QUOTE(_this call COMPILE_FILE(init3DEN));
+        ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(init3DEN)'));
     };
 };
diff --git a/addons/settings/XEH_preStart.sqf b/addons/settings/XEH_preStart.sqf
@@ -1,3 +1,7 @@
 #include "script_component.hpp"
 
 #include "XEH_PREP.sqf"
+
+PREP(gui_initDisplay);
+PREP(gui_initDisplay_disabled);
+PREP(init3DEN);
diff --git a/addons/settings/gui_initDisplay.sqf → addons/settings/fnc_gui_initDisplay.sqf b/addons/settings/gui_initDisplay.sqf → addons/settings/fnc_gui_initDisplay.sqf
diff --git a/addons/settings/gui_initDisplay_disabled.sqf → ...settings/fnc_gui_initDisplay_disabled.sqf b/addons/settings/gui_initDisplay_disabled.sqf → ...settings/fnc_gui_initDisplay_disabled.sqf
diff --git a/addons/settings/init3DEN.sqf → addons/settings/fnc_init3DEN.sqf b/addons/settings/init3DEN.sqf → addons/settings/fnc_init3DEN.sqf
diff --git a/addons/xeh/CfgEventHandlers.hpp b/addons/xeh/CfgEventHandlers.hpp
@@ -81,7 +81,7 @@ class Extended_Reloaded_EventHandlers {};
 // display xeh
 class Extended_DisplayLoad_EventHandlers {
     class Display3DEN {
-        ADDON = QUOTE(call COMPILE_FILE(XEH_3DENDisplayLoad));
+        ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(3DENDisplayLoad)'));
     };
 };
 class Extended_DisplayUnload_EventHandlers {};
diff --git a/addons/xeh/XEH_3DENDisplayLoad.sqf → addons/xeh/fnc_3DENDisplayLoad.sqf b/addons/xeh/XEH_3DENDisplayLoad.sqf → addons/xeh/fnc_3DENDisplayLoad.sqf
diff --git a/addons/xeh/fnc_preStart.sqf b/addons/xeh/fnc_preStart.sqf
@@ -29,6 +29,8 @@ with uiNamespace do {
     SLX_XEH_COMPILE = compileFinal "compile preprocessFileLineNumbers _this"; //backwards comps
     SLX_XEH_COMPILE_NEW = CBA_fnc_compileFunction; //backwards comp
 
+    PREP(3DENDisplayLoad);
+
     // call PreStart events
     {
         private _eventFunc = "";