diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-24 00:42:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-24 00:42:09 +0300 |
| commit | c312bd7e397cb7d54731d1184873bb70f5a9e403 (patch) | |
| tree | 87a3623f5df2bca4a3389182e90852c32f556eeb | |
| parent | ff287c2b0b763089d4eb271fde7e1cfc7904d29d (diff) | |
| download | manaplus-c312bd7e397cb7d54731d1184873bb70f5a9e403.tar.gz manaplus-c312bd7e397cb7d54731d1184873bb70f5a9e403.tar.bz2 manaplus-c312bd7e397cb7d54731d1184873bb70f5a9e403.tar.xz manaplus-c312bd7e397cb7d54731d1184873bb70f5a9e403.zip | |
eathena: fix name for packet CMSG_MERCENARY_ACTION.
| -rw-r--r-- | src/net/eathena/mercenaryhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/protocol.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp index 89e274252..46a9c2246 100644 --- a/src/net/eathena/mercenaryhandler.cpp +++ b/src/net/eathena/mercenaryhandler.cpp @@ -179,7 +179,7 @@ void MercenaryHandler::handleMercenaryMessage(const int cmd) void MercenaryHandler::fire() { - createOutPacket(SMSG_MERCENARY_ACTION); + createOutPacket(CMSG_MERCENARY_ACTION); outMsg.writeInt8(2, "action"); // delete } diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 673d70298..d081ea0d6 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -287,7 +287,6 @@ #define SMSG_MERCENARY_UPDATE 0x02a2 #define SMSG_MERCENARY_INFO 0x029b #define SMSG_MERCENARY_SKILLS 0x029d -#define SMSG_MERCENARY_ACTION 0x029f #define SMSG_HOMUNCULUS_SKILLS 0x0235 #define SMSG_HOMUNCULUS_DATA 0x0230 @@ -477,6 +476,7 @@ #define CMSG_PET_SELECT_EGG 0x01a7 #define CMSG_PET_MENU_ACTION 0x01a1 +#define CMSG_MERCENARY_ACTION 0x029f #define CMSG_HOMUNCULUS_SET_NAME 0x0231 #define CMSG_HOMUNCULUS_MENU 0x0361 #define CMSG_HOMMERC_MOVE_TO_MASTER 0x0234 |