Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in buttonLoadoutsSave, add row when other share a loadout

Browse Source
This commit is contained in:
Josuan Albin
2017-11-02 20:42:08 +01:00
parent a384c7992e
commit d6ffca9c70
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
addons/arsenal/XEH_postInit.sqf
View File

@ -32,6 +32,45 @@ GVAR(lastSearchTextRight) = "";
};
}] call CBA_fnc_addEventHandler;
[QGVAR(loadoutShared), {
_x params ["_contentPanel" ,"_loadoutArgs"];
_loadoutArgs params ["_playerName", "_loadoutName", "_loadoutData"];
if (!(isNil QGVAR(currentLoadoutsTab)) && {GVAR(currentLoadoutsTab) == IDC_buttonSharedLoadouts}) then {
private _curSelText =_contentPanel lnbText [(lnbCurSelRow _contentPanel), 1];
([_loadoutData] call FUNC(verifyLoadout)) params ["_loadout", "_nullItemsAmount", "_unavailableItemsAmount"];
private _newRow = _contentPanel lnbAddRow [_playerName, _loadoutName];
_contentPanel lnbSetPicture [[_newRow, 2], getText (configFile >> "cfgWeapons" >> ((_loadout select 0) select 0) >> "picture")];
_contentPanel lnbSetPicture [[_newRow, 3], getText (configFile >> "cfgWeapons" >> ((_loadout select 1) select 0) >> "picture")];
_contentPanel lnbSetPicture [[_newRow, 4], getText (configFile >> "cfgWeapons" >> ((_loadout select 2) select 0) >> "picture")];
_contentPanel lnbSetPicture [[_newRow, 5], getText (configFile >> "cfgWeapons" >> ((_loadout select 3) select 0) >> "picture")];
_contentPanel lnbSetPicture [[_newRow, 6], getText (configFile >> "cfgWeapons" >> ((_loadout select 4) select 0) >> "picture")];
_contentPanel lnbSetPicture [[_newRow, 7], getText (configFile >> "cfgVehicles" >> ((_loadout select 5) select 0) >> "picture")];
_contentPanel lnbSetPicture [[_newRow, 8], getText (configFile >> "cfgWeapons" >> (_loadout select 6) >> "picture")];
_contentPanel lnbSetPicture [[_newRow, 9], getText (configFile >> "cfgGlasses" >> (_loadout select 7) >> "picture")];
if (_nullItemsAmount > 0) then {
_contentPanel lnbSetColor [[_newRow, 1], [1, 0, 0, 0.5]];
} else {
if (_unavailableItemsAmount > 0) then {
_contentPanel lnbSetColor [[_newRow, 1], [1, 1, 1, 0.25]];
};
};
_contentPanel lnbSort [1, false];
// Select newly saved loadout
for '_i' from 0 to (((lnbsize _contentPanel) select 0) - 1) do {
if ((_contentPanel lnbText [_i, 1]) == _curSelText) exitwith {_contentPanel lnbSetCurSelRow _i};
};
};
}] call CBA_fnc_addEventHandler;
if (["ACE_Medical"] call EFUNC(common,isModLoaded)) then {
[QGVAR(displayOpened), {
GVAR(virtualItems) set [17, (GVAR(virtualItems) select 17) - ["FirstAidKit", "Medikit"]];

2
addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf
View File

@ -31,7 +31,7 @@ switch (GVAR(currentLoadoutsTab)) do {
{
for '_i' from 0 to (((lnbsize _contentPanelCtrl) select 0) - 1) do {
if ((_contentPanelCtrl lnbText [_i, 1]) == _x) exitwith {
if ((_contentPanelCtrl lnbText [_i, 1]) == (_x select 0)) exitwith {
if ((_contentPanelCtrl lnbText [_i, 0]) != "") then {
[(findDisplay IDD_ace_arsenal), format ["A loadout of yours with the same name is being shared", _editBoxContent]] call FUNC(message); // TBL
breakOut "main";

1
addons/arsenal/functions/fnc_buttonLoadoutsShare.sqf
View File

@ -26,6 +26,7 @@ if (_loadoutIndex > -1) then {
GVAR(sharedLoadoutsVars) pushBackUnique _loadoutVar;
_contentPanelCtrl lnbSetText [[_contentPanelCursSel, 0], "X"];
[QGVAR(loadoutShared), [_contentPanelCtrl, [_profileName ,_loadoutName , _loadoutData]]] call CBA_fnc_remoteEvent;
};
publicVariable QGVAR(sharedLoadoutsVars);