From 0d3db3288d4b626cbcfb3ee4a11f8d0ec760ae25 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 11 Aug 2017 21:46:20 +0300 Subject: Add packet CMSG_MAIL2_OPEN_MAILBOX 0x09e8. --- src/net/eathena/mail2handler.cpp | 12 ++++++++++++ src/net/eathena/mail2handler.h | 2 ++ src/net/eathena/packetsout.inc | 7 +++++++ src/net/mail2handler.h | 2 ++ src/net/tmwa/mail2handler.cpp | 4 ++++ src/net/tmwa/mail2handler.h | 2 ++ 6 files changed, 29 insertions(+) (limited to 'src') diff --git a/src/net/eathena/mail2handler.cpp b/src/net/eathena/mail2handler.cpp index 54ad503e7..b4b6de984 100644 --- a/src/net/eathena/mail2handler.cpp +++ b/src/net/eathena/mail2handler.cpp @@ -204,4 +204,16 @@ void Mail2Handler::refreshMailList(const int openType, outMsg.writeInt64(mailId, "mail id"); } +void Mail2Handler::openMailBox(const int openType) const +{ + if (packetVersion < 20140212 || + serverVersion < 19) + { + return; + } + createOutPacket(CMSG_MAIL2_OPEN_MAILBOX); + outMsg.writeInt8(openType, "open type"); + outMsg.writeInt64(0, "mail id"); +} + } // namespace EAthena diff --git a/src/net/eathena/mail2handler.h b/src/net/eathena/mail2handler.h index 2e41bea55..4ad44870b 100644 --- a/src/net/eathena/mail2handler.h +++ b/src/net/eathena/mail2handler.h @@ -65,6 +65,8 @@ class Mail2Handler final : public Net::Mail2Handler void refreshMailList(const int openType, const int64_t mailId) const override final; + + void openMailBox(const int openType) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index ed9574a09..dfe9808a2 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -328,6 +328,7 @@ packet(CMSG_MAIL2_DELETE_MAIL, 0x0000, 0, nullptr); packet(CMSG_MAIL2_REQUEST_MONEY, 0x0000, 0, nullptr); packet(CMSG_MAIL2_REQUEST_ITEMS, 0x0000, 0, nullptr); packet(CMSG_MAIL2_REFRESH_MAIL_LIST, 0x0000, 0, nullptr); +packet(CMSG_MAIL2_OPEN_MAILBOX, 0x0000, 0, nullptr); #else // 20040713 if (packetVersion >= 20040713) @@ -1300,6 +1301,12 @@ if (packetVersion == 20140205) packet(CMSG_NAME_REQUEST, 0x096a, 6, clif->pGetCharNameRequest); } +// 20140212 +if (packetVersion >= 20140212) +{ + packet(CMSG_MAIL2_OPEN_MAILBOX, 0x09e8, 11, clif->pRodexOpenMailbox); +} + // 20140305 if (packetVersion == 20140305) { diff --git a/src/net/mail2handler.h b/src/net/mail2handler.h index 49088ddec..b8a5301b1 100644 --- a/src/net/mail2handler.h +++ b/src/net/mail2handler.h @@ -71,6 +71,8 @@ class Mail2Handler notfinal virtual void refreshMailList(const int openType, const int64_t mailId) const = 0; + + virtual void openMailBox(const int openType) const = 0; }; } // namespace Net diff --git a/src/net/tmwa/mail2handler.cpp b/src/net/tmwa/mail2handler.cpp index 66aa67824..3d4af2ab9 100644 --- a/src/net/tmwa/mail2handler.cpp +++ b/src/net/tmwa/mail2handler.cpp @@ -86,4 +86,8 @@ void Mail2Handler::refreshMailList(const int openType A_UNUSED, { } +void Mail2Handler::openMailBox(const int openType A_UNUSED) const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/mail2handler.h b/src/net/tmwa/mail2handler.h index c80bffc27..2bc7a6dec 100644 --- a/src/net/tmwa/mail2handler.h +++ b/src/net/tmwa/mail2handler.h @@ -65,6 +65,8 @@ class Mail2Handler final : public Net::Mail2Handler void refreshMailList(const int openType, const int64_t mailId) const override final; + + void openMailBox(const int openType) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-60-g2f50