Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAGR / Kestrel - Fix deviceKey condition #8368

Merged
merged 3 commits into from
Sep 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/dagr/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion addons/dagr/initKeybinds.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion addons/kestrel4500/initKeybinds.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down