diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-31 00:19:18 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-31 00:19:18 +0300 |
commit | 694e07d193e7c5758a7d672b45668651b034003d (patch) | |
tree | 20a4aec8dee2b3b5475db9f3667e797fb43c603b /src/events/inputevent.h | |
parent | c9a84749b3b71d4df6cc3b9b488d60dc4a013a20 (diff) | |
download | manaverse-694e07d193e7c5758a7d672b45668651b034003d.tar.gz manaverse-694e07d193e7c5758a7d672b45668651b034003d.tar.bz2 manaverse-694e07d193e7c5758a7d672b45668651b034003d.tar.xz manaverse-694e07d193e7c5758a7d672b45668651b034003d.zip |
Convert InputAction enum into strong typed enum.
Diffstat (limited to 'src/events/inputevent.h')
-rw-r--r-- | src/events/inputevent.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/events/inputevent.h b/src/events/inputevent.h index 129e4d716..2eb615bb0 100644 --- a/src/events/inputevent.h +++ b/src/events/inputevent.h @@ -21,6 +21,8 @@ #ifndef EVENTS_INPUTEVENT_H #define EVENTS_INPUTEVENT_H +#include "enums/input/inputaction.h" + #include <map> #include <string> #include <vector> @@ -29,14 +31,14 @@ class ChatTab; -typedef std::vector<int> KeysVector; +typedef std::vector<InputActionT> KeysVector; typedef KeysVector::iterator KeysVectorIter; typedef KeysVector::const_iterator KeysVectorCIter; typedef std::map<int, KeysVector> KeyToActionMap; typedef KeyToActionMap::iterator KeyToActionMapIter; -typedef std::map<int, int> KeyToIdMap; +typedef std::map<int, InputActionT> KeyToIdMap; typedef KeyToIdMap::iterator KeyToIdMapIter; typedef std::map<int, int> KeyTimeMap; @@ -44,7 +46,8 @@ typedef KeyTimeMap::iterator KeyTimeMapIter; struct InputEvent final { - InputEvent(const int action0, const int mask0) : + InputEvent(const InputActionT action0, + const int mask0) : args(), tab(nullptr), action(action0), @@ -56,7 +59,7 @@ struct InputEvent final const int mask0) : args(args0), tab(tab0), - action(-1), + action(InputAction::NO_VALUE), mask(mask0) { } @@ -64,7 +67,7 @@ struct InputEvent final const std::string args; ChatTab *const tab; - const int action; + const InputActionT action; const int mask; }; |