summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-28 18:47:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-28 18:47:27 +0300
commit4ab5dab0c1d79c4c9fbf7c594bdb915b63a950f7 (patch)
tree81e17de542862518b5d69502ee83320f0127696e /src/game.cpp
parentb336adc59f3f65ef5c1fe7062e892fbd732cdec5 (diff)
downloadmv-4ab5dab0c1d79c4c9fbf7c594bdb915b63a950f7.tar.gz
mv-4ab5dab0c1d79c4c9fbf7c594bdb915b63a950f7.tar.bz2
mv-4ab5dab0c1d79c4c9fbf7c594bdb915b63a950f7.tar.xz
mv-4ab5dab0c1d79c4c9fbf7c594bdb915b63a950f7.zip
Allow change pet direction by pet emote key + move keys.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 51d9cab9c..1657192bb 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -870,8 +870,12 @@ void Game::handleMove()
localPlayer->cancelFollow();
}
- if (!inputManager.isActionActive(InputAction::EMOTE) || direction == 0)
+ if ((!inputManager.isActionActive(InputAction::EMOTE)
+ && !inputManager.isActionActive(InputAction::PET_EMOTE))
+ || direction == 0)
+ {
moveInDirection(direction);
+ }
}
BLOCK_END("Game::handleMove")
}