diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-23 14:51:30 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-23 14:51:30 +0300 |
commit | ab5e3e053a31efdc5799c1239e2bceaacf7cff61 (patch) | |
tree | 281095fe5a82edf1b377fe80910ec813c5b40064 | |
parent | c2a0903d2f487a6146bbf0829adb16afeb1efda5 (diff) | |
download | manaplus-ab5e3e053a31efdc5799c1239e2bceaacf7cff61.tar.gz manaplus-ab5e3e053a31efdc5799c1239e2bceaacf7cff61.tar.bz2 manaplus-ab5e3e053a31efdc5799c1239e2bceaacf7cff61.tar.xz manaplus-ab5e3e053a31efdc5799c1239e2bceaacf7cff61.zip |
eathena: rename packet CMSG_PET_REQUEST_STATE to CMSG_PET_SEND_MESSAGE.
-rw-r--r-- | src/net/eathena/pethandler.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/pethandler.h | 2 | ||||
-rw-r--r-- | src/net/eathena/protocol.h | 2 | ||||
-rw-r--r-- | src/net/pethandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/pethandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/pethandler.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp index c565cd280..00dc27c07 100644 --- a/src/net/eathena/pethandler.cpp +++ b/src/net/eathena/pethandler.cpp @@ -140,9 +140,9 @@ void PetHandler::catchPet(const Being *const being) const outMsg.writeInt32(being->getId(), "monster id"); } -void PetHandler::requestPetState(const int data) const +void PetHandler::sendPetMessage(const int data) const { - createOutPacket(CMSG_PET_REQUEST_STATE); + createOutPacket(CMSG_PET_SEND_MESSAGE); outMsg.writeInt32(data, "param"); } diff --git a/src/net/eathena/pethandler.h b/src/net/eathena/pethandler.h index 3f98b619b..58f1ffe4b 100644 --- a/src/net/eathena/pethandler.h +++ b/src/net/eathena/pethandler.h @@ -51,7 +51,7 @@ class PetHandler final : public MessageHandler, public Net::PetHandler void catchPet(const Being *const being) const override final; - void requestPetState(const int data) const override final; + void sendPetMessage(const int data) const override final; void processPetMessage(Net::MessageIn &msg); diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 188599ac0..5c57a7643 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -406,7 +406,7 @@ #define CMSG_PLAYER_SET_MEMO 0x011d #define CMSG_PET_CATCH 0x019f -#define CMSG_PET_REQUEST_STATE 0x01a9 +#define CMSG_PET_SEND_MESSAGE 0x01a9 #define CMSG_PET_SET_NAME 0x01a5 #define CMSG_PET_SELECT_EGG 0x01a7 #define CMSG_PET_MENU_ACTION 0x01a1 diff --git a/src/net/pethandler.h b/src/net/pethandler.h index 1d4ebbe50..914065593 100644 --- a/src/net/pethandler.h +++ b/src/net/pethandler.h @@ -45,7 +45,7 @@ class PetHandler notfinal virtual void catchPet(const Being *const being) const = 0; - virtual void requestPetState(const int data) const = 0; + virtual void sendPetMessage(const int data) const = 0; virtual void setName(const std::string &name) const = 0; diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp index ebbef5240..c5e7f481c 100644 --- a/src/net/tmwa/pethandler.cpp +++ b/src/net/tmwa/pethandler.cpp @@ -78,7 +78,7 @@ void PetHandler::catchPet(const Being *const being A_UNUSED) const { } -void PetHandler::requestPetState(const int data A_UNUSED) const +void PetHandler::sendPetMessage(const int data A_UNUSED) const { } diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h index ad487c629..31822d3d5 100644 --- a/src/net/tmwa/pethandler.h +++ b/src/net/tmwa/pethandler.h @@ -51,7 +51,7 @@ class PetHandler final : public MessageHandler, public Net::PetHandler void catchPet(const Being *const being) const override final; - void requestPetState(const int data) const override final; + void sendPetMessage(const int data) const override final; void setName(const std::string &name) const override final; |