summaryrefslogtreecommitdiff
path: root/src
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
parent0a3d5612b5091cdffbd7e60b9dc547dd9d572f2e (diff)
downloadmanaplus-ce2bd403c4d9297768d67ec615c2748fe4674333.tar.gz
manaplus-ce2bd403c4d9297768d67ec615c2748fe4674333.tar.bz2
manaplus-ce2bd403c4d9297768d67ec615c2748fe4674333.tar.xz
manaplus-ce2bd403c4d9297768d67ec615c2748fe4674333.zip
Allow move pet by mod key (left shift) + move keys.
Diffstat (limited to 'src')
-rw-r--r--src/actions/move.cpp8
-rw-r--r--src/game.cpp3
2 files changed, 10 insertions, 1 deletions
diff --git a/src/actions/move.cpp b/src/actions/move.cpp
index 449a3927a..bc03d7c0a 100644
--- a/src/actions/move.cpp
+++ b/src/actions/move.cpp
@@ -64,6 +64,8 @@ impHandler(moveUp)
return directUp(event);
else if (inputManager.isActionActive(InputAction::PET_EMOTE))
return petDirectUp(event);
+ else if (inputManager.isActionActive(InputAction::STOP_ATTACK))
+ return petMoveUp(event);
if (popupMenu->isPopupVisible())
{
popupMenu->moveUp();
@@ -78,6 +80,8 @@ impHandler(moveDown)
return directDown(event);
else if (inputManager.isActionActive(InputAction::PET_EMOTE))
return petDirectDown(event);
+ else if (inputManager.isActionActive(InputAction::STOP_ATTACK))
+ return petMoveDown(event);
if (popupMenu->isPopupVisible())
{
popupMenu->moveDown();
@@ -99,6 +103,8 @@ impHandler(moveLeft)
return directLeft(event);
else if (inputManager.isActionActive(InputAction::PET_EMOTE))
return petDirectLeft(event);
+ else if (inputManager.isActionActive(InputAction::STOP_ATTACK))
+ return petMoveLeft(event);
return closeMoveNpcDialog(false);
}
@@ -115,6 +121,8 @@ impHandler(moveRight)
return directRight(event);
else if (inputManager.isActionActive(InputAction::PET_EMOTE))
return petDirectRight(event);
+ else if (inputManager.isActionActive(InputAction::STOP_ATTACK))
+ return petMoveRight(event);
return closeMoveNpcDialog(false);
}
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);