mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Interact Menu - Add blocking while editing CT_EDIT (#8796)
* Interact Menu - Add blocking while editing CT_EDIT * use findIf * Use A3 defines
This commit is contained in:
parent
9209fedcf7
commit
5a72b61a50
@ -15,13 +15,21 @@
|
||||
* Public: No
|
||||
*/
|
||||
|
||||
#include "\a3\ui_f\hpp\defineResincl.inc"
|
||||
|
||||
params ["_menuType"];
|
||||
|
||||
if (GVAR(openedMenuType) == _menuType) exitWith {true};
|
||||
|
||||
// Conditions: Don't open when editing a text box
|
||||
private _isTextEditing = (allDisplays findIf {(ctrlType (focusedCtrl _x)) == CT_EDIT}) != -1;
|
||||
|
||||
// Conditions: canInteract (these don't apply to zeus)
|
||||
if ((isNull curatorCamera) && {
|
||||
!([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering", "isNotSitting", "isNotOnLadder", "isNotRefueling"]] call EFUNC(common,canInteractWith))
|
||||
if (
|
||||
_isTextEditing ||
|
||||
{(isNull curatorCamera) && {
|
||||
!([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering", "isNotSitting", "isNotOnLadder", "isNotRefueling"]] call EFUNC(common,canInteractWith))
|
||||
}
|
||||
}) exitWith {false};
|
||||
|
||||
while {dialog} do {
|
||||
|
Loading…
Reference in New Issue
Block a user