Add placeable and carryable flags

addons/flags/XEH_postInit.sqf

@@ -26,15 +26,3 @@ GVAR(isPlacing) = PLACE_CANCEL;
     ] call EFUNC(interact_menu,createAction);
     [_flag, 0, [], _pickupFlag] call EFUNC(interact_menu,addActionToObject);
 }] call CBA_fnc_addEventHandler;
-
-private _cfgWeapons = configFile >> "CfgWeapons";
-private _flagItems = (call (uiNamespace getVariable [QGVAR(allFlagItems), {[]}])) apply {_cfgWeapons >> _x};
-{
-    private _name = configName _x;
-    private _displayName = getText (_x >> "displayName");
-    private _texture = getText (_x >> QGVAR(texture));
-    private _actionIconPlace = getText (_x >> QGVAR(actionIconPlace));
-    private _actionIconCarry = getText (_x >> QGVAR(actionIconCarry));
-
-    GVAR(flagItemCache) set [_name, [_displayName, _texture, _actionIconPlace, _actionIconCarry]];
-} forEach _flagItems;

addons/flags/XEH_preInit.sqf

@@ -8,6 +8,6 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
-GVAR(flagItemCache) = createHashMap;
+GVAR(flagItemCache) = +(uiNamespace getVariable [QGVAR(flagItemCache), createHashMap]);
 
 ADDON = true;

addons/flags/XEH_preStart.sqf

@@ -2,5 +2,17 @@
 
 #include "XEH_PREP.hpp"
 
-private _flagItems = (configProperties [configFile >> "CfgWeapons", QUOTE(isClass _x && {isText (_x >> QQGVAR(texture))}), true]) apply {configName _x};
-uiNamespace setVariable [QGVAR(allFlagItems), compileFinal str _flagItems];
+private _flagItems = configProperties [configFile >> "CfgWeapons", QUOTE(isClass _x && {isText (_x >> QQGVAR(texture))}), true];
+private _flagItemCache = createHashMap;
+
+{
+    private _name = configName _x;
+    private _displayName = getText (_x >> "displayName");
+    private _texture = getText (_x >> QGVAR(texture));
+    private _actionIconPlace = getText (_x >> QGVAR(actionIconPlace));
+    private _actionIconCarry = getText (_x >> QGVAR(actionIconCarry));
+
+    _flagItemCache set [_name, [_displayName, _texture, _actionIconPlace, _actionIconCarry]];
+} forEach _flagItems;
+
+uiNamespace setVariable [QGVAR(flagItemCache), _flagItemCache];