Refuel - Cache refuel classes (#6807)

* Cache refuel classes * Apply suggestions from code review Co-Authored-By: dedmen <dedmen@users.noreply.github.com> * Fix script errors from inner _x
acemod · Feb 16, 2019 · 45fe16d · 45fe16d
1 parent 42c2c53
commit 45fe16d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 28 deletions.
diff --git a/addons/refuel/XEH_postInit.sqf b/addons/refuel/XEH_postInit.sqf
@@ -62,36 +62,26 @@ GVAR(actions) = [
 ];
 
 // init menu for config refuel vehicles
-private _sourceClasses = [];
+private _cacheRefuelClasses = call (uiNamespace getVariable [QGVAR(cacheRefuelClasses), {[[],[]]}]);
+_cacheRefuelClasses params [["_staticClasses", [], [[]]], ["_dynamicClasses", [], [[]]]];
+
 {
-    private _fuelCargo = getNumber (_x >> QGVAR(fuelCargo));
-    if (_fuelCargo > 0 || {_fuelCargo == REFUEL_INFINITE_FUEL}) then {
-        private _sourceClass = configName _x;
-        // check if we can use actions with inheritance
-        if (
-            !isText (_x >> "EventHandlers" >> "CBA_Extended_EventHandlers" >> "init") // addActionToClass relies on XEH init
-            || {configName _x isKindOf "Static"} // CBA_fnc_addClassEventHandler doesn't support "Static" class
-        ) then {
-            if (2 == getNumber (_x >> "scope")) then {
-                [_sourceClass, 0, ["ACE_MainActions"], GVAR(mainAction)] call EFUNC(interact_menu,addActionToClass);
-                {
-                    [_sourceClass, 0, ["ACE_MainActions", QGVAR(Refuel)], _x] call EFUNC(interact_menu,addActionToClass);
-                } forEach GVAR(actions);
-                TRACE_1("add menu to static",_sourceClass);
-            };
-        } else {
-            if (0 == {_sourceClass isKindOf _x} count _sourceClasses) then {
-                _sourceClasses pushBack _sourceClass;
-                [_sourceClass, 0, ["ACE_MainActions"], GVAR(mainAction), true] call EFUNC(interact_menu,addActionToClass);
-                {
-                    [_sourceClass, 0, ["ACE_MainActions", QGVAR(Refuel)], _x, true] call EFUNC(interact_menu,addActionToClass);
-                } forEach GVAR(actions);
-                TRACE_1("add menu to dynamic",_sourceClass);
-            };
-        };
-    };
-} forEach ('true' configClasses (configFile >> "CfgVehicles"));
+    private _className = _x;
+    [_className, 0, ["ACE_MainActions"], GVAR(mainAction)] call EFUNC(interact_menu,addActionToClass);
+    {
+        [_className, 0, ["ACE_MainActions", QGVAR(Refuel)], _x] call EFUNC(interact_menu,addActionToClass);
+    } forEach GVAR(actions);
+    TRACE_1("add menu to static",_x);
+} forEach _staticClasses;
 
+{
+    private _className = _x;
+    [_className, 0, ["ACE_MainActions"], GVAR(mainAction), true] call EFUNC(interact_menu,addActionToClass);
+    {
+        [_className, 0, ["ACE_MainActions", QGVAR(Refuel)], _x, true] call EFUNC(interact_menu,addActionToClass);
+    } forEach GVAR(actions);
+    TRACE_1("add menu to dynamic",_x);
+} forEach _dynamicClasses;
 
 #ifdef DRAW_HOOKS_POS
 addMissionEventHandler ["Draw3D", {

diff --git a/addons/refuel/XEH_preStart.sqf b/addons/refuel/XEH_preStart.sqf
@@ -1,3 +1,30 @@
 #include "script_component.hpp"
 
 #include "XEH_PREP.hpp"
+
+// cache refuel vehicles, see XEH_postInit.sqf
+private _staticClasses = [];
+private _dynamicClasses = [];
+
+{
+    private _fuelCargo = getNumber (_x >> QGVAR(fuelCargo));
+    if (_fuelCargo > 0 || {_fuelCargo == REFUEL_INFINITE_FUEL}) then {
+        private _sourceClass = configName _x;
+        // check if we can use actions with inheritance
+        if (
+            !isText (_x >> "EventHandlers" >> "CBA_Extended_EventHandlers" >> "init") // addActionToClass relies on XEH init
+            || {configName _x isKindOf "Static"} // CBA_fnc_addClassEventHandler doesn't support "Static" class
+        ) then {
+            if (2 == getNumber (_x >> "scope")) then {
+                _staticClasses pushBackUnique _sourceClass;
+            };
+        } else {
+            if (-1 == _dynamicClasses findIf {_sourceClass isKindOf _x}) then {
+                _dynamicClasses pushBackUnique _sourceClass;
+            };
+        };
+    };
+} forEach ('true' configClasses (configFile >> "CfgVehicles"));
+
+TRACE_2("compiled",count _staticClasses,count _dynamicClasses);
+uiNamespace setVariable [QGVAR(cacheRefuelClasses), compileFinal str [_staticClasses, _dynamicClasses]];