diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-08 02:53:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-08 03:27:51 +0300 |
| commit | ad0fcc99678c13c6f6ebacead6ba2d573294163d (patch) | |
| tree | d6550eb1ab13382544d7eb674b596a16c003302e /src/inputmanager.cpp | |
| parent | 4f73caba4497344c50ea245673493941d277699f (diff) | |
| download | mv-ad0fcc99678c13c6f6ebacead6ba2d573294163d.tar.gz mv-ad0fcc99678c13c6f6ebacead6ba2d573294163d.tar.bz2 mv-ad0fcc99678c13c6f6ebacead6ba2d573294163d.tar.xz mv-ad0fcc99678c13c6f6ebacead6ba2d573294163d.zip | |
Allow assign 3 keys to any action.
Diffstat (limited to 'src/inputmanager.cpp')
| -rw-r--r-- | src/inputmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp index 5e30f3894..32c4ac1f1 100644 --- a/src/inputmanager.cpp +++ b/src/inputmanager.cpp @@ -22,6 +22,7 @@ #include "game.h" #include "keyboardconfig.h" +#include "keydata.h" #include "localplayer.h" #include "gui/chatwindow.h" @@ -150,7 +151,7 @@ int InputManager::getInputConditionMask() return mask; } -bool InputManager::checkKey(KeyFunction *key, int mask) +bool InputManager::checkKey(const KeyData *key, int mask) { // logger->log("mask=%d, condition=%d", mask, key->condition); if (!key || (key->condition & mask) != key->condition) |