Merge pull request #6556 from alganthe/arsenalMissionUnitInsignias

Arsenal - Add support for mission defined unit insignias
acemod · Sep 3, 2018 · fe17370 · fe17370
2 parents 16a3bd0 + d13641d
commit fe17370
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/addons/arsenal/functions/fnc_fillLeftPanel.sqf b/addons/arsenal/functions/fnc_fillLeftPanel.sqf
@@ -162,6 +162,16 @@ switch true do {
                 {
                     ["CfgUnitInsignia", configName _x, _ctrlPanel, "texture"] call FUNC(addListBoxItem);
                 } foreach ("true" configClasses (configFile >> "CfgUnitInsignia"));
+
+                {
+                    private _displayName = getText (_x >> "displayName");
+                    private _className = configName _x;
+                    private _lbAdd =  _ctrlPanel lbAdd _displayName;
+
+                    _ctrlPanel lbSetData [_lbAdd, _className];
+                    _ctrlPanel lbSetPicture [_lbAdd, getText (_x >> "texture")];
+                    _ctrlPanel lbSetTooltip [_lbAdd, format ["%1\n%2", _displayName, _className]];
+                } foreach ("true" configClasses (missionConfigFile >> "CfgUnitInsignia"));
             };
         };
     };

diff --git a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf
@@ -412,7 +412,14 @@ switch (GVAR(currentLeftPanel)) do {
 
         call FUNC(showItem);
         TOGGLE_RIGHT_PANEL_HIDE
-        [_display, _control, _curSel, (configFile >> "CfgUnitInsignia" >> _item)] call FUNC(itemInfo);
+
+        private _unitInsigniaConfig = (configFile >> "CfgUnitInsignia" >> _item);
+
+        if (configName _unitInsigniaConfig isEqualTo "") then {
+            [_display, _control, _curSel, (missionConfigFile >> "CfgUnitInsignia" >> _item)] call FUNC(itemInfo);
+        } else {
+            [_display, _control, _curSel, _unitInsigniaConfig] call FUNC(itemInfo);
+        };
     };
 };