diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-12-27 21:58:26 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-12-27 22:02:35 +0300 |
commit | a065831539e63dc6e25f4743b3a548aadf92304a (patch) | |
tree | 437f04c89be9a9dc83f5d2487a73802cf6a10760 /src/actions/actions.cpp | |
parent | a9bad635bc89092b4c866a90018c803cd25592c0 (diff) | |
download | mv-a065831539e63dc6e25f4743b3a548aadf92304a.tar.gz mv-a065831539e63dc6e25f4743b3a548aadf92304a.tar.bz2 mv-a065831539e63dc6e25f4743b3a548aadf92304a.tar.xz mv-a065831539e63dc6e25f4743b3a548aadf92304a.zip |
Move pets actions into pets.cpp.
Diffstat (limited to 'src/actions/actions.cpp')
-rw-r--r-- | src/actions/actions.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index d43853790..6d54ec1bb 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -77,7 +77,6 @@ #include "net/ipc.h" #include "net/mercenaryhandler.h" #include "net/npchandler.h" -#include "net/pethandler.h" #include "net/playerhandler.h" #include "net/uploadcharinfo.h" #include "net/tradehandler.h" @@ -288,22 +287,6 @@ impHandler(emote) return false; } -impHandler(petEmote) -{ - if (event.action >= InputAction::PET_EMOTE_1 - && event.action <= InputAction::PET_EMOTE_48) - { - const int emotion = event.action - InputAction::PET_EMOTE_1; - if (emoteShortcut) - petHandler->emote(emoteShortcut->getEmote(emotion), 0); - if (Game::instance()) - Game::instance()->setValidSpeed(); - return true; - } - - return false; -} - impHandler(outfit) { if (inputManager.isActionActive(InputAction::WEAR_OUTFIT)) @@ -1401,23 +1384,6 @@ impHandler(uploadLog) return true; } -impHandler(catchPet) -{ - if (!localPlayer || !actorManager) - return false; - - Being *target = nullptr; - if (!event.args.empty()) - target = actorManager->findNearestByName(event.args); - if (!target) - target = localPlayer->getTarget(); - else - localPlayer->setTarget(target); - if (target) - petHandler->catchPet(target); - return true; -} - impHandler0(mercenaryFire) { mercenaryHandler->fire(); |