From 4ab5dab0c1d79c4c9fbf7c594bdb915b63a950f7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 28 Dec 2014 18:47:27 +0300 Subject: Allow change pet direction by pet emote key + move keys. --- src/actions/move.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/actions') diff --git a/src/actions/move.cpp b/src/actions/move.cpp index c75d24c36..449a3927a 100644 --- a/src/actions/move.cpp +++ b/src/actions/move.cpp @@ -23,6 +23,7 @@ #include "game.h" #include "actions/actiondef.h" +#include "actions/pets.h" #include "being/localplayer.h" @@ -61,6 +62,8 @@ impHandler(moveUp) { if (inputManager.isActionActive(InputAction::EMOTE)) return directUp(event); + else if (inputManager.isActionActive(InputAction::PET_EMOTE)) + return petDirectUp(event); if (popupMenu->isPopupVisible()) { popupMenu->moveUp(); @@ -73,6 +76,8 @@ impHandler(moveDown) { if (inputManager.isActionActive(InputAction::EMOTE)) return directDown(event); + else if (inputManager.isActionActive(InputAction::PET_EMOTE)) + return petDirectDown(event); if (popupMenu->isPopupVisible()) { popupMenu->moveDown(); @@ -92,6 +97,8 @@ impHandler(moveLeft) } if (inputManager.isActionActive(InputAction::EMOTE)) return directLeft(event); + else if (inputManager.isActionActive(InputAction::PET_EMOTE)) + return petDirectLeft(event); return closeMoveNpcDialog(false); } @@ -106,6 +113,8 @@ impHandler(moveRight) } if (inputManager.isActionActive(InputAction::EMOTE)) return directRight(event); + else if (inputManager.isActionActive(InputAction::PET_EMOTE)) + return petDirectRight(event); return closeMoveNpcDialog(false); } -- cgit v1.2.3-70-g09d2