From 3a320dc5d0cff4e3583e6c5ebe72c84e47034c69 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 Sep 2014 00:25:59 +0300 Subject: eathena: rename SMSG_MAP_CHAR_ID to SMSG_MAP_ACCOUNT_ID. --- src/net/eathena/gamehandler.cpp | 10 +++++----- src/net/eathena/gamehandler.h | 2 +- src/net/eathena/protocol.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 54c64d995..31c883158 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -53,7 +53,7 @@ GameHandler::GameHandler() : SMSG_WHO_ANSWER, SMSG_CHAR_SWITCH_RESPONSE, SMSG_MAP_QUIT_RESPONSE, - SMSG_MAP_CHAR_ID, + SMSG_MAP_ACCOUNT_ID, 0 }; handledMessages = _messages; @@ -85,8 +85,8 @@ void GameHandler::handleMessage(Net::MessageIn &msg) processMapQuitResponse(msg); break; - case SMSG_MAP_CHAR_ID: - processMapCharId(msg); + case SMSG_MAP_ACCOUNT_ID: + processMapAccountId(msg); break; default: @@ -171,9 +171,9 @@ void GameHandler::disconnect2() const MessageOut outMsg(CMSG_CLIENT_DISCONNECT); } -void GameHandler::processMapCharId(Net::MessageIn &msg) +void GameHandler::processMapAccountId(Net::MessageIn &msg) { - msg.readInt32(); // char id + msg.readInt32("account id"); } } // namespace EAthena diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index 075bc6f94..56af1979b 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -53,7 +53,7 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler void mapLoadedEvent() const override final; - static void processMapCharId(Net::MessageIn &msg); + static void processMapAccountId(Net::MessageIn &msg); bool mustPing() const override final A_WARN_UNUSED { return true; } diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 8f21b5738..d6c180b11 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -306,7 +306,7 @@ #define CMSG_SEND_CLIENT_INFO 0x7533 #define SMSG_UPDATE_HOST2 0x7534 -#define SMSG_MAP_CHAR_ID 0x0283 +#define SMSG_MAP_ACCOUNT_ID 0x0283 #define SMSG_PLAYER_SHORTCUTS 0x02b9 #define SMSG_PLAYER_SHOW_EQUIP 0x02da #define SMSG_NPC_CUTIN 0x01b3 -- cgit v1.2.3-70-g09d2