Merge pull request #408 from CBATeam/xeh-namespace-for-incompatible-c…

…lasses change incompatible class check to use own namespace
CBATeam · Jul 5, 2016 · 6868825 · 6868825
2 parents 011e17c + cd910d0
commit 6868825
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/addons/xeh/fnc_preInit.sqf b/addons/xeh/fnc_preInit.sqf
@@ -58,6 +58,8 @@ GVAR(EventsLowercase) = [];
 } forEach [XEH_EVENTS];
 
 // generate list of incompatible classes
+GVAR(incompatible) = [] call CBA_fnc_createNamespace;
+
 {
     private _class = configFile >> "CfgVehicles" >> _x;
 

diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp
@@ -21,9 +21,8 @@
 #define SETEVENTHANDLERS(type,class,events) (missionNamespace setVariable [SYS_EVENTHANDLERS(type,class), events])
 
 // For any class that does not comply with XEH or has at least one incompatible descendant.
-#define SYS_INCOMP(class) format [QGVAR(\%1), class]
-#define SETINCOMP(class) missionNamespace setVariable [SYS_INCOMP(class), true]
-#define ISINCOMP(class) !isNil SYS_INCOMP(class)
+#define ISINCOMP(class) !isNil {GVAR(incompatible) getVariable class}
+#define SETINCOMP(class) GVAR(incompatible) setVariable [class, true]
 
 // Event handler variables set.
 #define ISPROCESSED(obj) (obj getVariable [QGVAR(isProcessed), false])