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

Improve shared loadout check

Browse Source
This commit is contained in:
Josuan Albin
2017-11-04 02:15:32 +01:00
parent b6f4759a15
commit 2b93ceab91
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,4 +37,3 @@ if (GVAR(shiftState)) then {
[_display, "Current loadout exported to clipboard"] call FUNC(message);
};

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

@ -26,8 +26,8 @@ scopeName "main";
switch (GVAR(currentLoadoutsTab)) do {
case IDC_buttonMyLoadouts:{
private _similarSharedLoadouts = GVAR(sharedLoadoutsVars) select {_x == (profileName + _editBoxContent)};
if (count _similarSharedLoadouts > 0) exitWith {
private _similarSharedLoadout = (profileName + _editBoxContent) in GVAR(sharedLoadoutsVars);
if (_similarSharedLoadout) exitWith {
[(findDisplay IDD_ace_arsenal), format ["You are sharing a loadout with this name", _editBoxContent]] call FUNC(message); // TBL
breakOut "main";
};
@ -167,7 +167,6 @@ switch (GVAR(currentLoadoutsTab)) do {
};
if (count _sameNameLoadoutsList == 0) then {
GVAR(defaultLoadoutsList) pushBack [_editBoxContent, _loadout];
} else {
GVAR(defaultLoadoutsList) set [GVAR(defaultLoadoutsList) find (_sameNameLoadoutsList select 0), [[_editBoxContent, _loadoutName] select (_loadoutName isEqualTo _editBoxContent), _loadout]];
@ -200,13 +199,12 @@ switch (GVAR(currentLoadoutsTab)) do {
set3DENMissionAttributes [[QGVAR(DummyCategory), QGVAR(DefaultLoadoutsListAttribute), GVAR(defaultLoadoutsList)]];
} else {
private _similarSharedLoadouts = GVAR(sharedLoadoutsVars) select {_x == (profileName + _editBoxContent)};
if (count _similarSharedLoadouts > 0) exitWith {
private _similarSharedLoadout = (profileName + _editBoxContent) in GVAR(sharedLoadoutsVars);
if (_similarSharedLoadout) exitWith {
[(findDisplay IDD_ace_arsenal), format ["You are sharing a loadout with this name", _editBoxContent]] call FUNC(message); // TBL
breakOut "main";
};
if (count _sameNameLoadoutsList == 0) then {
_data pushBack [_editBoxContent, _curSelLoadout];
} else {
@ -217,9 +215,10 @@ switch (GVAR(currentLoadoutsTab)) do {
case IDC_buttonSharedLoadouts :{
if ((_contentPanelCtrl lnbText [_cursSelRow, 0]) == profileName) exitWith {
[(findDisplay IDD_ace_arsenal), format ["You are sharing this loadout", _editBoxContent]] call FUNC(message); // TBL
breakOut "main";
private _similarSharedLoadout = (profileName + _editBoxContent) in GVAR(sharedLoadoutsVars);
if (_similarSharedLoadout) exitWith {
[(findDisplay IDD_ace_arsenal), format ["You are sharing a loadout with this name", _editBoxContent]] call FUNC(message); // TBL
breakOut "main";
};
private _loadout = (GVAR(sharedLoadoutsNamespace) getVariable ((_contentPanelCtrl lnbText [_cursSelRow, 0]) + (_contentPanelCtrl lnbText [_cursSelRow, 1]))) select 2;