summaryrefslogtreecommitdiff
path: root/src/inputmanager.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-08 21:05:01 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-08 21:05:01 +0300
commitbb258f09a0b50f6382be2ff36637191a8b103c3f (patch)
tree419eb77c8c1502968e89fddff7f1e7c167d86a11 /src/inputmanager.h
parent30ef016b0a14f36dc480284e2d775295b5501dd4 (diff)
downloadmanaverse-bb258f09a0b50f6382be2ff36637191a8b103c3f.tar.gz
manaverse-bb258f09a0b50f6382be2ff36637191a8b103c3f.tar.bz2
manaverse-bb258f09a0b50f6382be2ff36637191a8b103c3f.tar.xz
manaverse-bb258f09a0b50f6382be2ff36637191a8b103c3f.zip
Move some more code from keyboardconfig to inputmanager.
Diffstat (limited to 'src/inputmanager.h')
-rw-r--r--src/inputmanager.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/inputmanager.h b/src/inputmanager.h
index b04f15726..0efe2d85e 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -21,6 +21,7 @@
#ifndef INPUTMANAGER_H
#define INPUTMANAGER_H
+#include "inputevent.h"
#include "keydata.h"
#include "gui/sdlinput.h"
@@ -134,6 +135,10 @@ class InputManager
int getNewKeyIndex() const
{ return mNewKeyIndex; }
+ void updateKeyActionMap(KeyToActionMap &actionMap, int type);
+
+ bool invokeKey(const KeyData *key, int keyNum, int mask);
+
protected:
Setup_Keyboard *mSetupKey; /**< Reference to setup window */