From 4214e31678fd6bd1e2c3c95f4694d23dcc054ece Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Thu, 21 Apr 2016 13:15:35 -0500
Subject: [PATCH] Fix BIS gesture keybinds

- From #3635 - FUNC(playSignal) needs "BIgesture" prefix
- Interaction conditions are checked on parent, don't need on every
child
---
 addons/gestures/CfgVehicles.hpp  | 28 ++++++++++++++--------------
 addons/gestures/XEH_postInit.sqf |  7 ++++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/gestures/CfgVehicles.hpp b/addons/gestures/CfgVehicles.hpp
index 4bf98f4978..8294f43759 100644
--- a/addons/gestures/CfgVehicles.hpp
+++ b/addons/gestures/CfgVehicles.hpp
@@ -13,98 +13,98 @@ class CfgVehicles {
 
                 class GVAR(Advance) {
                     displayName = CSTRING(Advance);
-                    condition = QUOTE(canStand _target);
+                    condition = QUOTE(true);
                     statement = QUOTE(_target playActionNow 'gestureAdvance';);
                     showDisabled = 1;
                     priority = 1.9;
                 };
                 class GVAR(Go) {
                     displayName = CSTRING(Go);
-                    condition = QUOTE(canStand _target);
+                    condition = QUOTE(true);
                     statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2););
                     showDisabled = 1;
                     priority = 1.8;
                 };
                 class GVAR(Follow) {
                     displayName = CSTRING(Follow);
-                    condition = QUOTE(canStand _target);
+                    condition = QUOTE(true);
                     statement = QUOTE(_target playActionNow 'gestureFollow';);
                     showDisabled = 1;
                     priority = 1.7;
                 };
                 class GVAR(Up) {
                     displayName = CSTRING(Up);
-                    condition = QUOTE(canStand _target);
+                    condition = QUOTE(true);
                     statement = QUOTE(_target playActionNow 'gestureUp';);
                     showDisabled = 1;
                     priority = 1.5;
                 };
                 class GVAR(CeaseFire) {
                     displayName = CSTRING(CeaseFire);
-                    condition = QUOTE(canStand _target);
+                    condition = QUOTE(true);
                     statement = QUOTE(_target playActionNow 'gestureCeaseFire';);
                     showDisabled = 1;
                     priority = 1.3;
                 };
                 class GVAR(Stop) {
                     displayName = CSTRING(Stop);
-                    condition = QUOTE(canStand _target);
+                    condition = QUOTE(true);
                     statement = QUOTE(_target playActionNow 'gestureFreeze';); // BI animation - is actualls "stop" in all stances but prone
                     showDisabled = 1;
                     priority = 1.2;
                 };
                 class GVAR(Forward) {
                     displayName = CSTRING(Forward);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(forward)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.9;
                 };
                 class GVAR(Regroup) {
                     displayName = CSTRING(Regroup);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(regroup)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.8;
                 };
                 class GVAR(Freeze) {
                     displayName = CSTRING(Freeze);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(freeze)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.7;
                 };
                 class GVAR(Cover) {
                     displayName = CSTRING(Cover);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(cover)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.6;
                 };
                 class GVAR(Point) {
                     displayName = CSTRING(Point);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(point)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.5;
                 };
                 class GVAR(Engage) {
                     displayName = CSTRING(Engage);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(engage)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.4;
                 };
                 class GVAR(Hold) {
                     displayName = CSTRING(Hold);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(hold)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.3;
                 };
                 class GVAR(Warning) {
                     displayName = CSTRING(Warning);
-                    condition = QUOTE(canStand _target && GVAR(ReloadMutex));
+                    condition = QUOTE(true);
                     statement = QUOTE(QUOTE(QGVAR(warning)) call FUNC(playSignal));
                     showDisabled = 1;
                     priority = 1.2;
diff --git a/addons/gestures/XEH_postInit.sqf b/addons/gestures/XEH_postInit.sqf
index b764aeb176..5aa1de9874 100644
--- a/addons/gestures/XEH_postInit.sqf
+++ b/addons/gestures/XEH_postInit.sqf
@@ -10,9 +10,10 @@ GVAR(ReloadMutex) = true;
     _x params ["_currentName", "_key", ["_vanillaKey", false] ];
 
     // Don't add "ace_gestures_" prefix to BI gestures
-    private _signalName = _currentName;
-    if (!_vanillaKey) then {
-        _signalName = format [QGVAR(%1), _currentName];
+     private _signalName = if (_vanillaKey) then {
+         format ["BIgesture%1", _currentName];
+    } else {
+         format [QGVAR(%1), _currentName];
     };
 
     private _code = compile format [QUOTE('%1' call FUNC(playSignal)), _signalName];