From 6394aa39611ce2730f4030a8ac45088ae6f20460 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 22 Feb 2015 18:27:16 +0300 Subject: eathena: allow move pet by left shift + cursor keys. --- src/actions/pets.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/actions/pets.cpp') diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp index 925ab993f..061a7dd6d 100644 --- a/src/actions/pets.cpp +++ b/src/actions/pets.cpp @@ -27,10 +27,12 @@ #include "actions/actiondef.h" #include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/chatconsts.h" #include "net/chathandler.h" +#include "net/net.h" #include "net/pethandler.h" #include "net/serverfeatures.h" @@ -44,13 +46,19 @@ namespace Actions static const Being *getPet() { +#ifdef TMWA_SUPPORT if (!localPlayer) return nullptr; - const std::vector &pets = localPlayer->getPets(); - if (pets.empty()) - return nullptr; - return *pets.begin(); + if (Net::getNetworkType() == ServerType::TMWATHENA) + { + const std::vector &pets = localPlayer->getPets(); + if (pets.empty()) + return nullptr; + return *pets.begin(); + } +#endif + return PlayerInfo::getPetBeing(); } impHandler(commandEmotePet) -- cgit v1.2.3-70-g09d2