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/actions | |
parent | c9a84749b3b71d4df6cc3b9b488d60dc4a013a20 (diff) | |
download | manaplus-694e07d193e7c5758a7d672b45668651b034003d.tar.gz manaplus-694e07d193e7c5758a7d672b45668651b034003d.tar.bz2 manaplus-694e07d193e7c5758a7d672b45668651b034003d.tar.xz manaplus-694e07d193e7c5758a7d672b45668651b034003d.zip |
Convert InputAction enum into strong typed enum.
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/actions.cpp | 4 | ||||
-rw-r--r-- | src/actions/commands.cpp | 2 | ||||
-rw-r--r-- | src/actions/move.cpp | 2 | ||||
-rw-r--r-- | src/actions/pets.cpp | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 0b8e8aedc..a3c17cb1d 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -65,6 +65,8 @@ #include "gui/widgets/tabs/chat/chattab.h" +#include "input/inputactionoperators.h" + #if defined USE_OPENGL #include "render/normalopenglgraphics.h" #endif @@ -284,7 +286,7 @@ static int getAmountFromEvent(const InputEvent &event, impHandler(emote) { - const int emotion = 1 + event.action - InputAction::EMOTE_1; + const int emotion = 1 + (event.action - InputAction::EMOTE_1); if (emotion > 0) { if (emoteShortcut) diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index 99b09914d..2de80b1f2 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -45,6 +45,8 @@ #include "gui/widgets/tabs/chat/whispertab.h" +#include "input/inputactionoperators.h" + #include "net/adminhandler.h" #include "net/chathandler.h" #include "net/guildhandler.h" diff --git a/src/actions/move.cpp b/src/actions/move.cpp index d708b1485..29d190ef9 100644 --- a/src/actions/move.cpp +++ b/src/actions/move.cpp @@ -36,6 +36,8 @@ #include "gui/popups/popupmenu.h" +#include "input/inputactionoperators.h" + #include "net/playerhandler.h" #include "debug.h" diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp index a6c9a24df..24f0d51c4 100644 --- a/src/actions/pets.cpp +++ b/src/actions/pets.cpp @@ -33,6 +33,8 @@ #include "gui/chatconsts.h" +#include "input/inputactionoperators.h" + #include "listeners/inputactionreplaylistener.h" #include "net/chathandler.h" |