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

UI - Fix selective UI in cargo (#6585)

Browse Source 
* UI - Fix selective UI in cargo

* Add FFV not in cargo check
This commit is contained in:
Dystopian 2019-03-11 06:40:28 +04:00 committed by PabstMirror
parent 51dfc081ac
commit 56f9d76d0f
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/ui/functions/fnc_setAdvancedElement.sqf
View File

@ -6,7 +6,7 @@
* Arguments: * Arguments:
* 0: Element Name <STRING> * 0: Element Name <STRING>
* 1: Show/Hide Element <BOOL> * 1: Show/Hide Element <BOOL>
* 2: Show Hint <BOOL> * 2: Show Hint <BOOL> (default: false)
* 3: Force change even when disallowed <BOOL> (default: false) * 3: Force change even when disallowed <BOOL> (default: false)
* *
* Return Value: * Return Value:
@ -18,12 +18,13 @@
* Public: No * Public: No
*/ */
params ["_element", "_show", ["_showHint", false, [true]], ["_force", false, [true]] ]; params ["_element", "_show", ["_showHint", false, [true]], ["_force", false, [true]]];
private _cachedElement = GVAR(configCache) getVariable _element; private _cachedElement = GVAR(configCache) getVariable _element;
if (isNil "_cachedElement") exitWith {}; if (isNil "_cachedElement") exitWith {TRACE_1("nil element",_this)};
if (!_force && {!GVAR(allowSelectiveUI)}) exitWith { if (!_force && {!GVAR(allowSelectiveUI)}) exitWith {
TRACE_1("not allowed",_this);
[LSTRING(Disallowed), 2] call EFUNC(common,displayTextStructured); [LSTRING(Disallowed), 2] call EFUNC(common,displayTextStructured);
false false
}; };
@ -31,8 +32,14 @@ if (!_force && {!GVAR(allowSelectiveUI)}) exitWith {
_cachedElement params ["_idd", "_elements", "_location", "_conditions"]; _cachedElement params ["_idd", "_elements", "_location", "_conditions"];
// Exit if main vehicle type condition not fitting // Exit if main vehicle type condition not fitting
private _canUseWeapon = ACE_player call CBA_fnc_canUseWeapon; private _canUseWeaponOrInCargo = ACE_player call CBA_fnc_canUseWeapon || {-1 < vehicle ACE_player getCargoIndex ACE_player};
if ((_canUseWeapon && {_location == 2}) || {!_canUseWeapon && {_location == 1}}) exitWith {false}; if (
(_canUseWeaponOrInCargo && {_location == VEHICLE_ONLY})
|| {!_canUseWeaponOrInCargo && {_location == GROUND_ONLY}}
) exitWith {
TRACE_3("skip location",_this,_canUseWeaponOrInCargo,_location);
false
};
// Get setting from config API // Get setting from config API
{ {
@ -59,7 +66,7 @@ if (!_force) then {
}; };
}; };
_show = [1, 0] select _show; private _fade = [1, 0] select _show;
// Disable/Enable elements // Disable/Enable elements
private _success = false; private _success = false;
@ -69,9 +76,9 @@ private _success = false;
// Loop through IGUI displays as they can be present several times for some reason // Loop through IGUI displays as they can be present several times for some reason
{ {
if (_idd == ctrlIDD _x) then { if (_idd == ctrlIDD _x) then {
//TRACE_3("Setting Element Visibility",_show,_idd,_idc); TRACE_4("Setting Element Visibility",_element,_fade,_idd,_idc);
(_x displayCtrl _idc) ctrlSetFade _show; (_x displayCtrl _idc) ctrlSetFade _fade;
(_x displayCtrl _idc) ctrlCommit 0; (_x displayCtrl _idc) ctrlCommit 0;
_success = true; _success = true;