DAGR / Kestrel - Fix deviceKey condition (acemod#8368)

* Fix DAGR keybind * Fix Kestrel keybind * Consistency with other deviceKey conditions
AndreasBrostrom · Dec 3, 2021 · de94ffd · de94ffd
1 parent f117b21
commit de94ffd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/addons/dagr/CfgVehicles.hpp b/addons/dagr/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
                     statement = QUOTE(call FUNC(menuInit));
                     showDisabled = 0;
                     icon = QPATHTOF(UI\DAGR_Icon.paa);
-                    exceptions[] = {"isNotInside", "isNotSitting"};
+                    exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
                     class GVAR(toggle) {
                         displayName = CSTRING(ToggleDAGR);
                         condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem));

diff --git a/addons/dagr/initKeybinds.sqf b/addons/dagr/initKeybinds.sqf
@@ -35,7 +35,7 @@ private _conditonCode = {
 };
 private _toggleCode = {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {};
+    if !([ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)) exitWith {false};
 
     // Statement
     [] call FUNC(toggleOverlay);

diff --git a/addons/kestrel4500/initKeybinds.sqf b/addons/kestrel4500/initKeybinds.sqf
@@ -32,7 +32,7 @@ private _conditonCode = {
 };
 private _toggleCode = {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {};
+    if !([ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)) exitWith {false};
 
     // Statement
     if (!GVAR(Overlay)) then {