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/inputmanager.h | |
| 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/inputmanager.h')
| -rw-r--r-- | src/inputmanager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inputmanager.h b/src/inputmanager.h index 374b402fb..2469e2e10 100644 --- a/src/inputmanager.h +++ b/src/inputmanager.h @@ -87,8 +87,6 @@ class InputManager bool handleEvent(const SDL_Event &event); - bool handleKeyEvent(const SDL_Event &event); - int getInputConditionMask(); bool checkKey(const KeyData *key, int mask); @@ -111,7 +109,7 @@ class InputManager void addActionKey(int action, int type, int val); - void setNewKey(const SDL_Event &event); + void setNewKey(const SDL_Event &event, int type); void unassignKey(); @@ -139,7 +137,9 @@ class InputManager bool invokeKey(const KeyData *key, int keyNum, int mask); - bool handleAssignKey(const SDL_Event &event); + bool handleAssignKey(const SDL_Event &event, int type); + + bool triggerAction(const KeysVector *ptrs); protected: Setup_Keyboard *mSetupKey; /**< Reference to setup window */ |