summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-24 01:28:28 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-24 01:28:28 +0300
commite22f6d0070ea2b0102caf3b738fba703606e6bd4 (patch)
treee40148f0e08490d6f3ea4a3f480739c717d9a70a /src/net
parent7f62fc6f4a1765d10cca3977cfbfe1917e4596fe (diff)
downloadmanaverse-e22f6d0070ea2b0102caf3b738fba703606e6bd4.tar.gz
manaverse-e22f6d0070ea2b0102caf3b738fba703606e6bd4.tar.bz2
manaverse-e22f6d0070ea2b0102caf3b738fba703606e6bd4.tar.xz
manaverse-e22f6d0070ea2b0102caf3b738fba703606e6bd4.zip
First step of removing local pets (tmwa only).
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/playerrecv.cpp3
-rw-r--r--src/net/eathena/beingrecv.cpp9
-rw-r--r--src/net/tmwa/pethandler.cpp21
3 files changed, 5 insertions, 28 deletions
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