use macro to guarantee consistent loading order between different con…

…figs
CBATeam · Feb 17, 2016 · 760e58e · 760e58e
1 parent 08b5ca3
commit 760e58e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/addons/xeh/fnc_initDisplay.sqf b/addons/xeh/fnc_initDisplay.sqf
@@ -15,5 +15,5 @@ if !(_event isEqualTo "") then {
             private ["_event", "_className"];
             _args call compile getText _x;
         } forEach configProperties [_x >> XEH_FORMAT_CONFIG_NAME(_event) >> _className, "isText _x"];
-    } forEach [configFile, campaignConfigFile, missionConfigFile];
+    } forEach XEH_MAIN_CONFIGS;
 };
diff --git a/addons/xeh/fnc_preInit.sqf b/addons/xeh/fnc_preInit.sqf
@@ -70,7 +70,7 @@ GVAR(allEventHandlers) = [];
 
 {
     GVAR(allEventHandlers) append (_x call CBA_fnc_compileEventHandlers);
-} forEach [configFile, campaignConfigFile, missionConfigFile];
+} forEach XEH_MAIN_CONFIGS;
 
 #ifdef DEBUG_MODE_FULL
     XEH_LOG("XEH: Compiling XEH END");

diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp
@@ -39,6 +39,8 @@
 
 #include "script_xeh.hpp"
 
+#define XEH_MAIN_CONFIGS [configFile, campaignConfigFile, missionConfigFile]
+
 #undef XEH_ENABLED
 #define XEH_ENABLED class EventHandlers { class XEH_CLASS: XEH_CLASS {}; }; SLX_XEH_DISABLED = 0