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 sharing EHs being broken, remove traces in them, prevent possible issue

Browse Source 
yeah, _x params doesn't work there :p
This commit is contained in:
Josuan Albin
2017-11-05 07:41:15 +01:00
parent c8a8cf7940
commit 81eac8614e
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
addons/arsenal/XEH_postInit.sqf
View File

@ -21,27 +21,25 @@ GVAR(lastSearchTextRight) = "";
}] call CBA_fnc_addEventHandler;
[QGVAR(loadoutUnshared), {
_x params ["_contentPanel" ,"_loadoutName"];
TRACE_3("loadoutUnshared EH", _contentPanel, _loadoutName, IDC_buttonSharedLoadouts);
params ["_contentPanel" , "_playerName", "_loadoutName"];
if (!(isNil QGVAR(currentLoadoutsTab)) && {GVAR(currentLoadoutsTab) == IDC_buttonSharedLoadouts}) then {
private _dataToCheck = _playerName + _loadoutName;
for '_i' from 0 to (((lnbsize _contentPanel) select 0) - 1) do {
if ((_contentPanel lnbText [_i, 1]) == _loadoutName) exitwith {_contentPanel lnbDeleteRow _i};
if ((_contentPanel lnbData [_i, 1]) == _dataToCheck) exitwith {_contentPanel lnbDeleteRow _i};
};
};
}] call CBA_fnc_addEventHandler;
[QGVAR(loadoutShared), {
_x params ["_contentPanel" ,"_loadoutArgs"];
params ["_contentPanel" ,"_loadoutArgs"];
_loadoutArgs params ["_playerName", "_loadoutName", "_loadoutData"];
TRACE_3("loadoutShared EH", _contentPanel, _loadoutArgs, IDC_buttonSharedLoadouts);
if (!(isNil QGVAR(currentLoadoutsTab)) && {GVAR(currentLoadoutsTab) == IDC_buttonSharedLoadouts}) then {
private _curSelText =_contentPanel lnbData [(lnbCurSelRow _contentPanel), 1];
private _curSelData =_contentPanel lnbData [(lnbCurSelRow _contentPanel), 1];
([_loadoutData] call FUNC(verifyLoadout)) params ["_loadout", "_nullItemsAmount", "_unavailableItemsAmount"];
private _newRow = _contentPanel lnbAddRow [_playerName, _loadoutName];
@ -69,9 +67,9 @@ GVAR(lastSearchTextRight) = "";
_contentPanel lnbSort [1, false];
// Select newly saved loadout
// Select previously selected loadout
for '_i' from 0 to (((lnbsize _contentPanel) select 0) - 1) do {
if ((_contentPanel lnbText [_i, 1]) == _curSelText) exitwith {_contentPanel lnbSetCurSelRow _i};
if ((_contentPanel lnbText [_i, 1]) == _curSelData) exitwith {_contentPanel lnbSetCurSelRow _i};
};
};
}] call CBA_fnc_addEventHandler;
@ -143,4 +141,4 @@ if (["ACE_dogtags"] call EFUNC(common,isModLoaded)) then {
_loadoutsData set [_index, [_loadoutName, _loadoutData]];
};
}] call CBA_fnc_addEventHandler;
};
};

5
addons/arsenal/functions/fnc_buttonLoadoutsDelete.sqf
View File

@ -35,8 +35,9 @@ if (GVAR(currentLoadoutsTab) != IDC_buttonSharedLoadouts) then {
_contentPanelCtrl lnbDeleteRow _contentPanelCursSel;
_contentPanelCtrl lnbSetCurSelRow (_contentPanelCursSel);
[QGVAR(loadoutUnshared), [_contentPanelCtrl, _loadoutName]] call CBA_fnc_remoteEvent;
publicVariable QGVAR(sharedLoadoutsVars);
[QGVAR(loadoutUnshared), [_contentPanelCtrl, profileName, _loadoutName]] call CBA_fnc_remoteEvent;
[(findDisplay IDD_ace_arsenal), format ["Loadout '%1' was unshared", _loadoutName]] call FUNC(message); // TBL
};

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

@ -19,7 +19,7 @@ if (_loadoutIndex > -1) then {
GVAR(sharedLoadoutsVars) = GVAR(sharedLoadoutsVars) - [_loadoutVar];
_contentPanelCtrl lnbSetText [[_contentPanelCursSel, 0], ""];
[QGVAR(loadoutUnshared), [_contentPanelCtrl, _loadoutName]] call CBA_fnc_remoteEvent;
[QGVAR(loadoutUnshared), [_contentPanelCtrl, profileName, _loadoutName]] call CBA_fnc_remoteEvent;
} else {
GVAR(sharedLoadoutsNamespace) setVariable [_loadoutVar, [_profileName ,_loadoutName , _loadoutData], true];

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

@ -80,6 +80,7 @@ if (GVAR(currentLoadoutsTab) != IDC_buttonSharedLoadouts) then {
private _loadoutVar = _playerName + _loadoutName;
GVAR(sharedLoadoutsNamespace) setVariable [_loadoutVar, nil, true];
GVAR(sharedLoadoutsVars) = GVAR(sharedLoadoutsVars) - [_loadoutVar];
[QGVAR(loadoutUnshared), [_contentPanelCtrl, profileName, _loadoutName, ]] call CBA_fnc_remoteEvent;
} else {