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

Prevent the interact menu from closing dialogs opened by the actions

Browse Source
This commit is contained in:
Nicolás Badano
2015-03-31 18:05:47 -03:00
parent 9a182b98b6
commit 149fd13fce
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addons/interact_menu/functions/fnc_keyUp.sqf
View File

@ -15,6 +15,10 @@
// Exit if there's no menu opened // Exit if there's no menu opened
if (GVAR(openedMenuType) < 0) exitWith {true}; if (GVAR(openedMenuType) < 0) exitWith {true};
if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then {
closeDialog 0;
};
if(GVAR(actionSelected)) then { if(GVAR(actionSelected)) then {
this = GVAR(selectedTarget); this = GVAR(selectedTarget);
@ -27,7 +31,9 @@ if(GVAR(actionSelected)) then {
// Check the action conditions // Check the action conditions
_actionData = GVAR(selectedAction) select 0; _actionData = GVAR(selectedAction) select 0;
systemChat "Checking Condition";
if ([_target, _player, _actionData select 6] call (_actionData select 4)) then { if ([_target, _player, _actionData select 6] call (_actionData select 4)) then {
systemChat format ["Condition met: %1", [_target, _player, _actionData select 6, (_actionData select 3)]];
// Call the statement // Call the statement
[_target, _player, _actionData select 6] call (_actionData select 3); [_target, _player, _actionData select 6] call (_actionData select 3);
@ -40,10 +46,6 @@ GVAR(keyDown) = false;
GVAR(keyDownSelfAction) = false; GVAR(keyDownSelfAction) = false;
GVAR(openedMenuType) = -1; GVAR(openedMenuType) = -1;
if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then {
closeDialog 0;
};
GVAR(expanded) = false; GVAR(expanded) = false;
GVAR(lastPath) = []; GVAR(lastPath) = [];
GVAR(menuDepthPath) = []; GVAR(menuDepthPath) = [];