From a3475e987b0e642b2b9aa9c6cbf74762c6c77d23 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 10 Apr 2012 23:14:47 +0300
Subject: Add two default keys to input layout. Add action type to default
 keys. Remove hardcoded joystick actions.

---
 src/gui/setup_input.cpp | 2 +-
 src/gui/viewport.cpp    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index cdcae13c4..f4d2f51e1 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -104,7 +104,7 @@ static SetupActionData const setupActionData[] =
     },
     {
         N_("Stop Attack"),
-        Input::KEY_TARGET
+        Input::KEY_STOP_ATTACK
     },
     {
         N_("Untarget"),
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 59b7377f4..3b58e03a9 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -511,7 +511,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (player_node != mHoverBeing)
                     {
                         player_node->attack(mHoverBeing,
-                            !inputManager.isActionActive(Input::KEY_TARGET));
+                            !inputManager.isActionActive(
+                            Input::KEY_STOP_ATTACK));
                         return;
                     }
                 }
-- 
cgit v1.2.3-70-g09d2