From 17e9519c2ee0b126db5ba1df61dcddf9f7b90b47 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 22 Aug 2017 20:12:44 +0300 Subject: Move requestCheckName from BeingHandler into Mail2Handler. --- src/net/beinghandler.h | 2 -- src/net/eathena/beinghandler.cpp | 11 ----------- src/net/eathena/beinghandler.h | 2 -- src/net/eathena/mail2handler.cpp | 11 +++++++++++ src/net/eathena/mail2handler.h | 2 ++ src/net/eathena/packetsout.inc | 4 ++-- src/net/mail2handler.h | 2 ++ src/net/tmwa/beinghandler.cpp | 4 ---- src/net/tmwa/beinghandler.h | 2 -- src/net/tmwa/mail2handler.cpp | 4 ++++ src/net/tmwa/mail2handler.h | 2 ++ 11 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index 5c3da3887..ccf998def 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -49,8 +49,6 @@ class BeingHandler notfinal virtual void requestRanks(const RankT rank) const = 0; virtual void viewPlayerEquipment(const Being *const being) const = 0; - - virtual void requestCheckName(const std::string &name) const = 0; }; } // namespace Net diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 94e58457b..d53848654 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -106,15 +106,4 @@ void BeingHandler::requestNameByCharId(const int id) const outMsg.writeInt32(id, "character id"); } -void BeingHandler::requestCheckName(const std::string &name) const -{ - if (packetVersion < 20140423 || - serverVersion < 19) - { - return; - } - createOutPacket(CMSG_CHECK_NAME); - outMsg.writeString(name, 24, "name"); -} - } // namespace EAthena diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index f101ed258..cb8f8c248 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -47,8 +47,6 @@ class BeingHandler final : public Ea::BeingHandler void viewPlayerEquipment(const Being *const being) const override final; - - void requestCheckName(const std::string &name) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/mail2handler.cpp b/src/net/eathena/mail2handler.cpp index bf6f178fb..52360d7b7 100644 --- a/src/net/eathena/mail2handler.cpp +++ b/src/net/eathena/mail2handler.cpp @@ -242,4 +242,15 @@ void Mail2Handler::cancelWriteMail() const createOutPacket(CMSG_MAIL2_CANCEL_WRITE_MAIL); } +void Mail2Handler::requestCheckName(const std::string &name) const +{ + if (packetVersion < 20140423 || + serverVersion < 19) + { + return; + } + createOutPacket(CMSG_MAIL2_CHECK_NAME); + outMsg.writeString(name, 24, "name"); +} + } // namespace EAthena diff --git a/src/net/eathena/mail2handler.h b/src/net/eathena/mail2handler.h index de4a26d12..af28b7631 100644 --- a/src/net/eathena/mail2handler.h +++ b/src/net/eathena/mail2handler.h @@ -71,6 +71,8 @@ class Mail2Handler final : public Net::Mail2Handler void closeMailBox() const override final; void cancelWriteMail() const override final; + + void requestCheckName(const std::string &name) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index 3eb90b33c..652a29f66 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -317,7 +317,7 @@ packet(CMSG_BOOKING_REGISTER_REQ, 0x0000, 0, nullptr); packet(CMSG_BOOKING_SEARCH_REQ, 0x0000, 0, nullptr); packet(CMSG_BOOKING_DELETE_REQ, 0x0000, 0, nullptr); packet(CMSG_BOOKING_UPDATE_REQ, 0x0000, 0, nullptr); -packet(CMSG_CHECK_NAME, 0x0000, 0, nullptr); +packet(CMSG_MAIL2_CHECK_NAME, 0x0000, 0, nullptr); packet(CMSG_MAIL2_OPEN_WRITE_MAIL, 0x0000, 0, nullptr); packet(CMSG_MAIL2_ADD_ITEM_TO_MAIL, 0x0000, 0, nullptr); packet(CMSG_MAIL2_REMOVE_ITEM_MAIL, 0x0000, 0, nullptr); @@ -1434,7 +1434,7 @@ if (packetVersion >= 20140416) // 20140423 if (packetVersion >= 20140423) { - packet(CMSG_CHECK_NAME, 0x0a13, 26, clif->pRodexCheckName); + packet(CMSG_MAIL2_CHECK_NAME, 0x0a13, 26, clif->pRodexCheckName); } // 20140605 diff --git a/src/net/mail2handler.h b/src/net/mail2handler.h index baff5576e..3b04fb464 100644 --- a/src/net/mail2handler.h +++ b/src/net/mail2handler.h @@ -79,6 +79,8 @@ class Mail2Handler notfinal virtual void closeMailBox() const = 0; virtual void cancelWriteMail() const = 0; + + virtual void requestCheckName(const std::string &name) const = 0; }; } // namespace Net diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 74b0334fd..c4e57627e 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -71,8 +71,4 @@ void BeingHandler::requestNameByCharId(const int id A_UNUSED) const { } -void BeingHandler::requestCheckName(const std::string &name A_UNUSED) const -{ -} - } // namespace TmwAthena diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index e7eeb148c..04cced3ed 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -48,8 +48,6 @@ class BeingHandler final : public Ea::BeingHandler A_CONST; void requestNameByCharId(const int id) const override final A_CONST; - - void requestCheckName(const std::string &name) const override final; }; } // namespace TmwAthena diff --git a/src/net/tmwa/mail2handler.cpp b/src/net/tmwa/mail2handler.cpp index c96506ce8..1224ed79d 100644 --- a/src/net/tmwa/mail2handler.cpp +++ b/src/net/tmwa/mail2handler.cpp @@ -98,4 +98,8 @@ void Mail2Handler::cancelWriteMail() const { } +void Mail2Handler::requestCheckName(const std::string &name A_UNUSED) const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/mail2handler.h b/src/net/tmwa/mail2handler.h index ce01bd180..0bc0e2bb2 100644 --- a/src/net/tmwa/mail2handler.h +++ b/src/net/tmwa/mail2handler.h @@ -71,6 +71,8 @@ class Mail2Handler final : public Net::Mail2Handler void closeMailBox() const override final; void cancelWriteMail() const override final; + + void requestCheckName(const std::string &name) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-70-g09d2