From 2556c72eea6a7d28d543d991e5d5c519726028f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Apr 2012 02:51:44 +0300 Subject: Add joystick key assign ability in keyboard dialog. --- src/inputmanager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/inputmanager.h') 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 */ -- cgit v1.2.3-60-g2f50