diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/actionmanager.cpp | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/actionmanager.cpp')
| -rw-r--r-- | src/actionmanager.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index e34482c13..7d3b653a8 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -139,6 +139,13 @@ impHandler(moveRight) return false; } +impHandler(moveForward) +{ + if (inputManager.isActionActive(Input::KEY_EMOTE)) + return directRight(event); + return false; +} + impHandler(emote) { const int emotion = 1 + event.action - Input::KEY_EMOTE_1; |