summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-29 16:48:19 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-29 16:48:19 +0300
commitce2bd403c4d9297768d67ec615c2748fe4674333 (patch)
tree75b4563908f4d861e50a0be9ffdbf28c50d17163 /src/game.cpp
parent0a3d5612b5091cdffbd7e60b9dc547dd9d572f2e (diff)
downloadplus-ce2bd403c4d9297768d67ec615c2748fe4674333.tar.gz
plus-ce2bd403c4d9297768d67ec615c2748fe4674333.tar.bz2
plus-ce2bd403c4d9297768d67ec615c2748fe4674333.tar.xz
plus-ce2bd403c4d9297768d67ec615c2748fe4674333.zip
Allow move pet by mod key (left shift) + move keys.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 1657192bb..7a5bd7fd2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -871,7 +871,8 @@ void Game::handleMove()
}
if ((!inputManager.isActionActive(InputAction::EMOTE)
- && !inputManager.isActionActive(InputAction::PET_EMOTE))
+ && !inputManager.isActionActive(InputAction::PET_EMOTE)
+ && !inputManager.isActionActive(InputAction::STOP_ATTACK))
|| direction == 0)
{
moveInDirection(direction);