From 6a67f52f6b82bb8c6259eb0b9282ab543347b9ee Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 24 Aug 2016 01:48:07 +0300 Subject: Remove unused pet handler methods and fields. --- src/net/eathena/pethandler.cpp | 17 +++-------------- src/net/eathena/pethandler.h | 13 +++---------- src/net/pethandler.h | 13 +++---------- src/net/tmwa/pethandler.cpp | 16 ++-------------- src/net/tmwa/pethandler.h | 13 +++---------- 5 files changed, 14 insertions(+), 58 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp index 06e9985fe..8ae6a169b 100644 --- a/src/net/eathena/pethandler.cpp +++ b/src/net/eathena/pethandler.cpp @@ -39,8 +39,8 @@ PetHandler::PetHandler() petHandler = this; } -void PetHandler::move(const int petId A_UNUSED, - const int x, const int y) const +void PetHandler::move(const int x, + const int y) const { if (!serverFeatures->haveMovePet()) return; @@ -50,14 +50,7 @@ void PetHandler::move(const int petId A_UNUSED, outMsg.writeInt16(CAST_S16(y), "y"); } -void PetHandler::spawn(const Being *const being A_UNUSED, - const int petId A_UNUSED, - const int x A_UNUSED, const int y A_UNUSED) const -{ -} - -void PetHandler::emote(const uint8_t emoteId, - const int petId A_UNUSED) +void PetHandler::emote(const uint8_t emoteId) { createOutPacket(CMSG_PET_EMOTE); outMsg.writeInt8(emoteId, "emote id"); @@ -127,8 +120,4 @@ void PetHandler::setDirection(const unsigned char type) const "pet direction"); } -void PetHandler::startAi(const bool start A_UNUSED) const -{ -} - } // namespace EAthena diff --git a/src/net/eathena/pethandler.h b/src/net/eathena/pethandler.h index ab5eaded6..32ff49984 100644 --- a/src/net/eathena/pethandler.h +++ b/src/net/eathena/pethandler.h @@ -33,15 +33,10 @@ class PetHandler final : public Net::PetHandler A_DELETE_COPY(PetHandler) - void move(const int petId, - const int x, const int y) const override final; + void move(const int x, + const int y) const override final; - void spawn(const Being *const being, - const int petId, - const int x, const int y) const override final A_CONST; - - void emote(const uint8_t emoteId, - const int petId) override final; + void emote(const uint8_t emoteId) override final; void catchPet(const Being *const being) const override final; @@ -60,8 +55,6 @@ class PetHandler final : public Net::PetHandler void unequip() const override final; void setDirection(const unsigned char type) const override final; - - void startAi(const bool start) const override final A_CONST; }; } // namespace EAthena diff --git a/src/net/pethandler.h b/src/net/pethandler.h index 5c9099afa..b33e8b8db 100644 --- a/src/net/pethandler.h +++ b/src/net/pethandler.h @@ -32,15 +32,10 @@ class PetHandler notfinal virtual ~PetHandler() { } - virtual void move(const int petId, - const int x, const int y) const = 0; + virtual void move(const int x, + const int y) const = 0; - virtual void spawn(const Being *const being, - const int petId, - const int x, const int y) const = 0; - - virtual void emote(const uint8_t emoteId, - const int petId) = 0; + virtual void emote(const uint8_t emoteId) = 0; virtual void catchPet(const Being *const being) const = 0; @@ -59,8 +54,6 @@ class PetHandler notfinal virtual void unequip() const = 0; virtual void setDirection(const unsigned char type) const = 0; - - virtual void startAi(const bool start) const = 0; }; } // namespace Net diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp index 4f82a6e59..328b0ed99 100644 --- a/src/net/tmwa/pethandler.cpp +++ b/src/net/tmwa/pethandler.cpp @@ -40,20 +40,12 @@ PetHandler::PetHandler() : petHandler = this; } -void PetHandler::move(const int petId A_UNUSED, - const int x A_UNUSED, +void PetHandler::move(const int x A_UNUSED, const int y A_UNUSED) const { } -void PetHandler::spawn(const Being *const being A_UNUSED, - const int petId A_UNUSED, - const int x A_UNUSED, const int y A_UNUSED) const -{ -} - -void PetHandler::emote(const uint8_t emoteId A_UNUSED, - const int petId A_UNUSED) +void PetHandler::emote(const uint8_t emoteId A_UNUSED) { } @@ -93,8 +85,4 @@ void PetHandler::setDirection(const unsigned char type A_UNUSED) const { } -void PetHandler::startAi(const bool start A_UNUSED) const -{ -} - } // namespace TmwAthena diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h index 6362151cd..ababc2fee 100644 --- a/src/net/tmwa/pethandler.h +++ b/src/net/tmwa/pethandler.h @@ -33,15 +33,10 @@ class PetHandler final : public Net::PetHandler A_DELETE_COPY(PetHandler) - void move(const int petId, - const int x, const int y) const override final; + void move(const int x, + const int y) const override final; - void spawn(const Being *const being, - const int petId, - const int x, const int y) const override final A_CONST; - - void emote(const uint8_t emoteId, - const int petId) override final; + void emote(const uint8_t emoteId) override final; void catchPet(const Being *const being) const override final A_CONST; @@ -61,8 +56,6 @@ class PetHandler final : public Net::PetHandler void setDirection(const unsigned char type) const override final; - void startAi(const bool start) const override final; - protected: int mRandCounter; }; -- cgit v1.2.3-70-g09d2