From e22f6d0070ea2b0102caf3b738fba703606e6bd4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 24 Aug 2016 01:28:28 +0300
Subject: First step of removing local pets (tmwa only).

---
 src/net/ea/playerrecv.cpp     |  3 ---
 src/net/eathena/beingrecv.cpp |  9 ---------
 src/net/tmwa/pethandler.cpp   | 21 +++++----------------
 3 files changed, 5 insertions(+), 28 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp
index c8ebd6651..8eed1ad4b 100644
--- a/src/net/ea/playerrecv.cpp
+++ b/src/net/ea/playerrecv.cpp
@@ -120,9 +120,6 @@ void PlayerRecv::processPlayerWarp(Net::MessageIn &msg)
 
         localPlayer->setAction(BeingAction::STAND, 0);
         localPlayer->setTileCoords(x, y);
-#ifdef TMWA_SUPPORT
-        localPlayer->updatePets();
-#endif
         localPlayer->navigateClean();
         localPlayer->reset();
     }
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 1fc49deaf..cc744e18d 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -451,9 +451,6 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
         case ActorType::Elemental:
             break;
         case ActorType::FloorItem:
-#ifdef TMWA_SUPPORT
-        case ActorType::LocalPet:
-#endif
         case ActorType::Avatar:
         case ActorType::Unknown:
             reportAlways("Wrong being type detected: %d",
@@ -671,9 +668,6 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
         case ActorType::Elemental:
             break;
         case ActorType::FloorItem:
-#ifdef TMWA_SUPPORT
-        case ActorType::LocalPet:
-#endif
         case ActorType::Avatar:
         case ActorType::Unknown:
             reportAlways("Wrong being type detected: %d",
@@ -887,9 +881,6 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
         case ActorType::Elemental:
             break;
         case ActorType::FloorItem:
-#ifdef TMWA_SUPPORT
-        case ActorType::LocalPet:
-#endif
         case ActorType::Avatar:
         case ActorType::Unknown:
             reportAlways("Wrong being type detected: %d",
diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp
index 7748a4385..4f82a6e59 100644
--- a/src/net/tmwa/pethandler.cpp
+++ b/src/net/tmwa/pethandler.cpp
@@ -41,10 +41,9 @@ PetHandler::PetHandler() :
 }
 
 void PetHandler::move(const int petId A_UNUSED,
-                      const int x, const int y) const
+                      const int x A_UNUSED,
+                      const int y A_UNUSED) const
 {
-    chatHandler->talk(strprintf("\302\202\302m%d,%dg%d",
-        x, y, tick_time), GENERAL_CHANNEL);
 }
 
 void PetHandler::spawn(const Being *const being A_UNUSED,
@@ -53,15 +52,9 @@ void PetHandler::spawn(const Being *const being A_UNUSED,
 {
 }
 
-void PetHandler::emote(const uint8_t emoteId,
+void PetHandler::emote(const uint8_t emoteId A_UNUSED,
                        const int petId A_UNUSED)
 {
-    mRandCounter ++;
-    if (mRandCounter > 10000)
-        mRandCounter = 1000;
-
-    chatHandler->talk(strprintf("\302\202\302e%dz%d",
-        CAST_S32(emoteId), mRandCounter), GENERAL_CHANNEL);
 }
 
 void PetHandler::catchPet(const Being *const being A_UNUSED) const
@@ -96,16 +89,12 @@ void PetHandler::unequip() const
 {
 }
 
-void PetHandler::setDirection(const unsigned char type) const
+void PetHandler::setDirection(const unsigned char type A_UNUSED) const
 {
-    chatHandler->talk(strprintf("\302\202\302d%dg%d",
-        CAST_S32(type), tick_time), GENERAL_CHANNEL);
 }
 
-void PetHandler::startAi(const bool start) const
+void PetHandler::startAi(const bool start A_UNUSED) const
 {
-    chatHandler->talk(strprintf("\302\202\302a%dg%d",
-        start ? 1 : 0, tick_time), GENERAL_CHANNEL);
 }
 
 }  // namespace TmwAthena
-- 
cgit v1.2.3-60-g2f50