summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.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/keyboardconfig.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/keyboardconfig.h')
-rw-r--r--src/keyboardconfig.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 3f3e5f95d..71e43c230 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -35,13 +35,6 @@
union SDL_Event;
-typedef std::vector<int> KeysVector;
-typedef KeysVector::iterator KeysVectorIter;
-typedef KeysVector::const_iterator KeysVectorCIter;
-
-typedef std::map<int, KeysVector> KeyToActionMap;
-typedef KeyToActionMap::iterator KeyToActionMapIter;
-
class KeyboardConfig
{
public:
@@ -78,14 +71,14 @@ class KeyboardConfig
int getKeyValueFromEvent(const SDL_Event &event) const;
- void updateKeyActionMap();
-
bool triggerAction(const SDL_Event &event);
std::string getKeyName(int key);
bool isActionActive(int index) const;
+ void update();
+
private:
bool mEnabled; /**< Flag to respond to key input */