diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-10 02:51:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-10 02:56:05 +0300 |
| commit | 2556c72eea6a7d28d543d991e5d5c519726028f0 (patch) | |
| tree | 111cf3f26eaf3a5734ec1e22d3985897feb6cd04 /src/client.cpp | |
| parent | 8f3be5cd0544af07c6cb65bef7a1f3ba1a3704bb (diff) | |
| download | manaplus-2556c72eea6a7d28d543d991e5d5c519726028f0.tar.gz manaplus-2556c72eea6a7d28d543d991e5d5c519726028f0.tar.bz2 manaplus-2556c72eea6a7d28d543d991e5d5c519726028f0.tar.xz manaplus-2556c72eea6a7d28d543d991e5d5c519726028f0.zip | |
Add joystick key assign ability in keyboard dialog.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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: |