From 241f1aefbdb76ed951c4925437c6cfbced6f1cbc Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 27 Aug 2020 09:37:20 -0600 Subject: [PATCH] fix face, voice, insignia in arsenal (#7879) --- addons/arsenal/ACE_Arsenal_Sorts.hpp | 4 ++-- addons/arsenal/defines.hpp | 2 +- addons/arsenal/functions/fnc_compileSorts.sqf | 5 ++++- .../arsenal/functions/fnc_fillLeftPanel.sqf | 2 +- addons/arsenal/functions/fnc_fillSort.sqf | 8 ++++---- addons/arsenal/functions/fnc_handleStats.sqf | 2 +- .../arsenal/functions/fnc_onArsenalOpen.sqf | 4 ++-- .../functions/fnc_onSelChangedLeft.sqf | 2 +- addons/arsenal/functions/fnc_showItem.sqf | 2 +- addons/arsenal/functions/fnc_sortPanel.sqf | 20 ++++++++++++------- addons/arsenal/ui/RscAttributes.hpp | 4 ++-- 11 files changed, 32 insertions(+), 23 deletions(-) diff --git a/addons/arsenal/ACE_Arsenal_Sorts.hpp b/addons/arsenal/ACE_Arsenal_Sorts.hpp index 2ed1aa92ee..aa397e9f80 100644 --- a/addons/arsenal/ACE_Arsenal_Sorts.hpp +++ b/addons/arsenal/ACE_Arsenal_Sorts.hpp @@ -9,14 +9,14 @@ class GVAR(sorts) { class ACE_alphabetically: sortBase { scope = 2; displayName = "$STR_a3_rscdisplayarsenal_sort_alphabet"; - tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}, {0,1,2,3,4,5,6,7}}; + tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}, {0,1,2,3,4,5,6,7}}; statement = QUOTE({}); }; class ACE_mod: sortBase { scope = 2; displayName = "$STR_a3_rscdisplayarsenal_sort_mod"; - tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}, {0,1,2,3,4,5,6,7}}; + tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}, {0,1,2,3,4,5,6,7}}; statement = QUOTE(_this call FUNC(sortStatement_mod)); }; diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp index 7e38023b5c..fd71c5eaee 100644 --- a/addons/arsenal/defines.hpp +++ b/addons/arsenal/defines.hpp @@ -79,7 +79,7 @@ #define IDC_iconBackgroundVoice 2034 #define IDC_buttonVoice 2035 #define IDC_iconBackgroundInsigna 2036 -#define IDC_buttonInsigna 2037 +#define IDC_buttonInsignia 2037 #define IDC_iconBackgroundOptic 21 #define IDC_buttonOptic 22 #define IDC_iconBackgroundItemAcc 23 diff --git a/addons/arsenal/functions/fnc_compileSorts.sqf b/addons/arsenal/functions/fnc_compileSorts.sqf index 762ff14a3d..423bec30b3 100644 --- a/addons/arsenal/functions/fnc_compileSorts.sqf +++ b/addons/arsenal/functions/fnc_compileSorts.sqf @@ -38,7 +38,10 @@ private _sortListLeftPanel = [ [], // GPS 11 [], // Radio 12 [], // Compass 13 - [] // Watch 14 + [], // Watch 14 + [], // Face 15 + [], // Voice 16 + [] // Insignia 17 ]; private _sortListRightPanel = [ diff --git a/addons/arsenal/functions/fnc_fillLeftPanel.sqf b/addons/arsenal/functions/fnc_fillLeftPanel.sqf index c8d3f97734..1dca06b065 100644 --- a/addons/arsenal/functions/fnc_fillLeftPanel.sqf +++ b/addons/arsenal/functions/fnc_fillLeftPanel.sqf @@ -162,7 +162,7 @@ switch true do { ["CfgVoice", configName _x, _ctrlPanel, "icon"] call FUNC(addListBoxItem); } foreach _voices; }; - case IDC_buttonInsigna : { + case IDC_buttonInsignia : { { ["CfgUnitInsignia", configName _x, _ctrlPanel, "texture"] call FUNC(addListBoxItem); } foreach ("true" configClasses (configFile >> "CfgUnitInsignia")); diff --git a/addons/arsenal/functions/fnc_fillSort.sqf b/addons/arsenal/functions/fnc_fillSort.sqf index 065296ebbd..a6e93a0508 100644 --- a/addons/arsenal/functions/fnc_fillSort.sqf +++ b/addons/arsenal/functions/fnc_fillSort.sqf @@ -60,9 +60,6 @@ private _sorts = if (_rightSort && {GVAR(currentLeftPanel) in [IDC_buttonUniform } ) }; - case ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsigna] find _idc > -1): { - [] - }; default { GVAR(sortListLeftPanel) select ([ IDC_buttonPrimaryWeapon, @@ -79,7 +76,10 @@ private _sorts = if (_rightSort && {GVAR(currentLeftPanel) in [IDC_buttonUniform IDC_buttonGPS, IDC_buttonRadio, IDC_buttonCompass, - IDC_buttonWatch + IDC_buttonWatch, + IDC_buttonFace, + IDC_buttonVoice, + IDC_buttonInsignia ] find _idc) }; } diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index 26597716ea..0d071740b7 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -152,7 +152,7 @@ if (!isNil "_itemCfg") then { if (ctrlIDC _control == IDC_leftTabContent) then { - if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsigna] find GVAR(currentLeftPanel) > -1) then { + if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsignia] find GVAR(currentLeftPanel) > -1) then { [[1, 2, 3, 4, 5]] call _hideUnusedFnc; _statsBoxCtrl ctrlSetPosition [ diff --git a/addons/arsenal/functions/fnc_onArsenalOpen.sqf b/addons/arsenal/functions/fnc_onArsenalOpen.sqf index 9af448fd09..b59d1b28a9 100644 --- a/addons/arsenal/functions/fnc_onArsenalOpen.sqf +++ b/addons/arsenal/functions/fnc_onArsenalOpen.sqf @@ -288,7 +288,7 @@ if (is3DEN) then { } forEach [ IDC_buttonFace, IDC_buttonVoice, - IDC_buttonInsigna + IDC_buttonInsignia ]; _buttonCloseCtrl = _display displayCtrl IDC_menuBarClose; @@ -308,7 +308,7 @@ if (is3DEN) then { } forEach [ IDC_buttonFace, IDC_buttonVoice, - IDC_buttonInsigna + IDC_buttonInsignia ]; }; diff --git a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf index 375406930c..1e6c851f0f 100644 --- a/addons/arsenal/functions/fnc_onSelChangedLeft.sqf +++ b/addons/arsenal/functions/fnc_onSelChangedLeft.sqf @@ -418,7 +418,7 @@ switch (GVAR(currentLeftPanel)) do { [_display, _control, _curSel, (configFile >> "CfgVoice" >> _item)] call FUNC(itemInfo); }; - case IDC_buttonInsigna : { + case IDC_buttonInsignia : { [GVAR(center), _item] call bis_fnc_setUnitInsignia; GVAR(currentInsignia) = _item; diff --git a/addons/arsenal/functions/fnc_showItem.sqf b/addons/arsenal/functions/fnc_showItem.sqf index d9bf74f061..58142d5a3f 100644 --- a/addons/arsenal/functions/fnc_showItem.sqf +++ b/addons/arsenal/functions/fnc_showItem.sqf @@ -43,7 +43,7 @@ private _nextAction = switch (GVAR(currentLeftPanel)) do { case IDC_buttonBinoculars : { ["Civil", "Binoculars"] select (GVAR(currentItems) select 9 != "") }; - case IDC_buttonInsigna : { + case IDC_buttonInsignia : { "Salute" }; case IDC_buttonVoice : { diff --git a/addons/arsenal/functions/fnc_sortPanel.sqf b/addons/arsenal/functions/fnc_sortPanel.sqf index 8169cf7889..48dd72c54e 100644 --- a/addons/arsenal/functions/fnc_sortPanel.sqf +++ b/addons/arsenal/functions/fnc_sortPanel.sqf @@ -56,9 +56,12 @@ if (_rightSort) then { [ _display displayCtrl IDC_leftTabContent, switch (GVAR(currentLeftPanel)) do { - case IDC_buttonBackpack: { "CfgVehicles" }; - case IDC_buttonGoggles: { "CfgGlasses" }; - default { "CfgWeapons" }; + case IDC_buttonBackpack: { configFile >> "CfgVehicles" }; + case IDC_buttonGoggles: { configFile >> "CfgGlasses" }; + case IDC_buttonFace: { configFile >> "CfgFaces" >> "Man_A3" }; + case IDC_buttonVoice: { configFile >> "CfgVoice" }; + case IDC_buttonInsignia: { configFile >> "CfgUnitInsignia" }; + default { configFile >> "CfgWeapons" }; }, (GVAR(sortListLeftPanel) select ([ IDC_buttonPrimaryWeapon, @@ -75,7 +78,10 @@ if (_rightSort) then { IDC_buttonGPS, IDC_buttonRadio, IDC_buttonCompass, - IDC_buttonWatch + IDC_buttonWatch, + IDC_buttonFace, + IDC_buttonVoice, + IDC_buttonInsignia ] find GVAR(currentLeftPanel))) ] } params ["_panel", "_cfgClass", "_sorts"]; @@ -111,7 +117,7 @@ _for do { } else { _panel lbData _i }; - private _itemCfg = configFile >> _cfgClass >> _item; + private _itemCfg = _cfgClass >> _item; private _value = _itemCfg call _statement; if (_value isEqualType 0) then { _value = [_value, 8] call CBA_fnc_formatNumber; @@ -134,7 +140,7 @@ if (_right) then { if (_cursel >= 0) then { if (_data == _selected) then {_panel lnbSetCurSelRow _i}; }; - _panel lnbSetText [[_i, 1], getText (configFile >> _cfgClass >> _data >> "displayName")]; + _panel lnbSetText [[_i, 1], getText (_cfgClass >> _data >> "displayName")]; }; } else { lbSort [_panel, "ASC"]; @@ -144,6 +150,6 @@ if (_right) then { if (_cursel >= 0) then { if (_data == _selected) then {_panel lbSetCurSel _i}; }; - _panel lbSetText [_i, getText (configFile >> _cfgClass >> _data >> "displayName")]; + _panel lbSetText [_i, getText (_cfgClass >> _data >> "displayName")]; }; }; diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index 036e5d9f3d..c2fe9713ba 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -753,7 +753,7 @@ class GVAR(display) { y = QUOTE(170 * GRID_H); }; class buttonInsigna: buttonPrimaryWeapon { - idc = IDC_buttonInsigna; + idc = IDC_buttonInsignia; tooltip="$STR_A3_RscDisplayArsenal_tab_Insignia"; text="\A3\Ui_f\data\GUI\Rsc\RscDisplayArsenal\Insignia_ca.paa"; y = QUOTE(170 * GRID_H); @@ -881,7 +881,7 @@ class GVAR(display) { tooltip="$STR_A3_RscDisplayArsenal_tab_CargoMisc"; y = QUOTE(safezoneY + 88 * GRID_H); }; - + class buttonRemoveAll: ctrlButtonPicture { idc = IDC_buttonRemoveAll; text = QPATHTOF(data\iconClearContainer.paa);