summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-25 22:06:39 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-25 22:07:05 +0300
commit192b8db5c67860ec9a67d19d9529b01794ae1c83 (patch)
tree20713692df12ae3a4cece7f9bd174239a0294639 /src/game.cpp
parent393865bc4af7d3a7f96ff66480f6b7f7085fb41f (diff)
downloadmanaplus-192b8db5c67860ec9a67d19d9529b01794ae1c83.tar.gz
manaplus-192b8db5c67860ec9a67d19d9529b01794ae1c83.tar.bz2
manaplus-192b8db5c67860ec9a67d19d9529b01794ae1c83.tar.xz
manaplus-192b8db5c67860ec9a67d19d9529b01794ae1c83.zip
Add command and action for show homunculus/mercenary emotes.
New chat command: /homunemote emote /mercemote emote
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index cce123b79..204732a15 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -895,6 +895,7 @@ void Game::handleMove()
if ((!inputManager.isActionActive(InputAction::EMOTE)
&& !inputManager.isActionActive(InputAction::PET_EMOTE)
+ && !inputManager.isActionActive(InputAction::HOMUN_EMOTE)
&& !inputManager.isActionActive(InputAction::STOP_ATTACK))
|| direction == 0)
{