From 4ab5dab0c1d79c4c9fbf7c594bdb915b63a950f7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 28 Dec 2014 18:47:27 +0300
Subject: Allow change pet direction by pet emote key + move keys.

---
 src/game.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/game.cpp')

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")
 }
-- 
cgit v1.2.3-70-g09d2