Merge remote-tracking branch 'origin/master' into release-candidate-3-10

CBATeam · Mar 1, 2019 · 03a89cb · 03a89cb
2 parents c186b30 + bd585de
commit 03a89cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
@@ -47,8 +47,8 @@ call COMPILE_FILE(init_perFrameHandler);
 call COMPILE_FILE(init_delayLess);
 
 // Due to activateAddons being overwritten by eachother (only the last executed command will be active), we apply this bandaid
-activateAddons call (uiNamespace getVariable [QGVAR(unitAddons), {[]}]);
 GVAR(addons) = call (uiNamespace getVariable [QGVAR(addons), {[]}]);
+activateAddons GVAR(addons);
 
 // BWC
 #include "backwards_comp.sqf"

diff --git a/addons/common/XEH_preStart.sqf b/addons/common/XEH_preStart.sqf
@@ -3,21 +3,4 @@
 //See usage in XEH_preInit
 private _cfgPatches = configFile >> "CfgPatches";
 private _allComponents = "true" configClasses _cfgPatches apply {configName _x};
-
-//Filter out addons that don't have any units defined as we don't need to activate these
-private _unitAddons = _allComponents select {
-    !(getArray (_cfgPatches >> _x >> "units") isEqualTo [])
-};
-
-//Filter out addons defined in CfgAddons as they are always activated
-private _allAddons = "true" configClasses (configFile >> "CfgAddons");
-private _preloadedAddons = [];
-
-{
-    _preloadedAddons append (getArray (_x >> "list") apply {configName (_cfgPatches >> _x)});
-} forEach _allAddons;
-
-_unitAddons = _unitAddons - _preloadedAddons;
-
 uiNamespace setVariable [QGVAR(addons), compileFinal str _allComponents];
-uiNamespace setVariable [QGVAR(unitAddons), compileFinal str _unitAddons];
diff --git a/addons/ui/CfgFunctions.hpp b/addons/ui/CfgFunctions.hpp
@@ -19,6 +19,9 @@ class CfgFunctions {
             class flexiMenu_keyUp {
                 file = QUOTE(PATHTOF(flexiMenu\fnc_keyUp.sqf));
             };
+            class menu {
+                file = QUOTE(PATHTOF(flexiMenu\fnc_menu.sqf));
+            };
             class flexiMenu_menu {
                 file = QUOTE(PATHTOF(flexiMenu\fnc_menu.sqf));
             };