From a53ab7f74574e2bdd018563ded7a62d2a7357314 Mon Sep 17 00:00:00 2001
From: verysecrethero <hnorthh@gmail.com>
Date: Wed, 10 Feb 2016 20:46:16 +0100
Subject: [PATCH] A few fixes for DashAbility. Default DoubleTapToDash is now
 set to false.

---
 .../Engine/Input/FirstPersonInputController.h | 25 +++++++++++--------
 resources/DefaultInput.ini                    |  4 +--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/Engine/Input/FirstPersonInputController.h b/include/Engine/Input/FirstPersonInputController.h
index 2bbd768d..20402cd0 100644
--- a/include/Engine/Input/FirstPersonInputController.h
+++ b/include/Engine/Input/FirstPersonInputController.h
@@ -54,6 +54,7 @@ protected:
     //specialabilitys
     bool m_MovementKeyDown = false;
     bool m_SpecialAbilityKeyDown = false;
+    int m_NumberOfMovementKeysDown = 0;
 
     EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
     bool OnLockMouse(const Events::LockMouse& e);
@@ -131,6 +132,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         }
         //if value = 0 then you have just released this key
         if (e.Value != 0) {
+            m_NumberOfMovementKeysDown++;
             m_MovementKeyDown = true;
             //if you pressed the same key within m_AssaultDashDoubleTapSensitivityTimer then you have doubletapped it
             if (m_AssaultDashDoubleTapDeltaTime < m_AssaultDashDoubleTapSensitivityTimer && m_AssaultDashTapDirection == m_CurrentDirectionVector) {
@@ -138,10 +140,14 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             }
         } else {
             //== 0
-            m_MovementKeyDown = false;
-            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-            m_AssaultDashTapDirection = m_CurrentDirectionVector;
-            m_AssaultDashDoubleTapDeltaTime = 0.f;
+            m_NumberOfMovementKeysDown--;
+            if (m_NumberOfMovementKeysDown == 0) {
+                m_MovementKeyDown = false;
+            }
+                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+                m_AssaultDashTapDirection = m_CurrentDirectionVector;
+                m_AssaultDashDoubleTapDeltaTime = 0.f;
+            
         }
     }
 
@@ -201,12 +207,6 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
-        //moving to the side has priority
-        return;
-    }
-
-    //dashing with doubletap - check if doubletap to dash enabled
-    if (ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
         return;
     }
 
@@ -215,6 +215,11 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         m_AssaultDashDoubleTapped = false;
     }
 
+    //dashing with doubletap - check if doubletap to dash enabled
+    if (!ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
+        return;
+    }
+
     //check if we have received a valid doubletap
     if (!m_ValidDoubleTap) {
         return;
diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini
index eb5b7658..35aceeb1 100644
--- a/resources/DefaultInput.ini
+++ b/resources/DefaultInput.ini
@@ -2,8 +2,8 @@
 Sensitivity=0.5
 InvertPitch=false
 
-[KeyBoard]
-DoubleTapToDash=true
+[Keyboard]
+DoubleTapToDash=false
 
 [Bindings]
 MouseLeft=PrimaryFire