From 2556c72eea6a7d28d543d991e5d5c519726028f0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 10 Apr 2012 02:51:44 +0300
Subject: Add joystick key assign ability in keyboard dialog.

---
 src/client.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index a7ee6a32c..c8755b499 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -857,7 +857,11 @@ int Client::gameExec()
                         break;
 
                     case SDL_KEYDOWN:
-                        inputManager.handleAssignKey(event);
+                        inputManager.handleAssignKey(event, INPUT_KEYBOARD);
+                        break;
+
+                    case SDL_JOYBUTTONDOWN:
+                        inputManager.handleAssignKey(event, INPUT_JOYSTICK);
                         break;
 
                     default:
-- 
cgit v1.2.3-60-g2f50