From 330977a709858636f27275463e0fdc7b7fe0f8e6 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Tue, 29 Mar 2016 16:03:41 +0200
Subject: [PATCH] Remove including DIK KeyCodes definitions, use decimal codes,
 Improve BI gesture handling even further

---
 addons/gestures/XEH_postInit.sqf | 42 ++++++++++++++++++++++++++++++-
 addons/gestures/key.sqf          | 43 --------------------------------
 2 files changed, 41 insertions(+), 44 deletions(-)
 delete mode 100644 addons/gestures/key.sqf

diff --git a/addons/gestures/XEH_postInit.sqf b/addons/gestures/XEH_postInit.sqf
index 3b4a92164e..ea63e2a388 100644
--- a/addons/gestures/XEH_postInit.sqf
+++ b/addons/gestures/XEH_postInit.sqf
@@ -5,4 +5,44 @@ if (!hasInterface) exitWith {};
 // reload mutex, you can't play signal while reloading
 GVAR(ReloadMutex) = true;
 
-#include "key.sqf"
+{
+    _x params ["_currentName", "_key", ["_vanillaKey", ""] ];
+
+    private _signalName = format [QGVAR(%1), _currentName];
+
+    // Don't add "ace_gestures_" prefix to BI gestures
+    if (_vanillaKey == "BI") then {
+        _signalName = _currentName;
+    };
+
+    private _code = compile format [QUOTE('%1' call FUNC(playSignal)), _signalName];
+
+    TRACE_4("Adding KeyBind",_currentName,_signalName,_code,_key);
+
+    [
+        "ACE3 Gestures",
+        _currentName,
+        localize format [LSTRING(%1), _currentName],
+        _code,
+        {false},
+        [_key,  [false, (_key != -1), false]],
+        false
+    ] call CBA_fnc_addKeybind;
+
+    false
+} count [
+    ["Freeze", 80], // Numpad 2
+    ["Cover", 81], // Numpad 3
+    ["Forward", 75], // Numpad 4
+    ["Regroup", 76], // Numpad 5
+    ["Engage", 77], // Numpad 6
+    ["Point", 71], // Numpad 7
+    ["Hold", 72], // Numpad 8
+    ["Warning", 73], // Numpad 9
+    ["Go", -1, "BI"],
+    ["Advance", -1, "BI"],
+    ["Follow", -1, "BI"],
+    ["Up", -1, "BI"],
+    ["Stop", -1, "BI"],
+    ["CeaseFire", -1, "BI"]
+];
diff --git a/addons/gestures/key.sqf b/addons/gestures/key.sqf
deleted file mode 100644
index 98c21d4862..0000000000
--- a/addons/gestures/key.sqf
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "\a3\editor_f\Data\Scripts\dikCodes.h"
-
-{
-    _x params ["_currentName","_key"];
-
-    private _signalName = format [QGVAR(%1), _currentName];
-
-    //Don't add "ace_gestures_" prefix to BI gestures
-    if (_key == -1) then {
-        _signalName = _currentName;
-    };
-
-    private _code = compile format [QUOTE('%1' call FUNC(playSignal)), _signalName];
-
-    TRACE_4("Adding KeyBind",_currentName,_signalName,_code,_key);
-
-    [
-        "ACE3 Gestures",
-        _currentName,
-        localize format [LSTRING(%1), _currentName],
-        _code,
-        {false},
-        [_key,  [false, (_key != -1), false]],
-        false
-    ] call CBA_fnc_addKeybind;
-
-    false
-} count [
-    ["Freeze", DIK_NUMPAD2],
-    ["Cover", DIK_NUMPAD3],
-    ["Forward", DIK_NUMPAD4],
-    ["Regroup", DIK_NUMPAD5],
-    ["Engage", DIK_NUMPAD6],
-    ["Point", DIK_NUMPAD7],
-    ["Hold", DIK_NUMPAD8],
-    ["Warning", DIK_NUMPAD9],
-    ["Go", -1],
-    ["Advance", -1],
-    ["Follow", -1],
-    ["Up", -1],
-    ["Stop", -1],
-    ["CeaseFire", -1]
-];