From 307ef5331a3f18a28820f773b0dfce8db479bf7a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 11 Aug 2017 20:45:11 +0300 Subject: Add packet CMSG_MAIL2_REQUEST_MONEY 0x09f1. --- src/net/eathena/mail2handler.cpp | 13 +++++++++++++ src/net/eathena/mail2handler.h | 3 +++ src/net/eathena/packetsout.inc | 7 +++++++ src/net/mail2handler.h | 3 +++ src/net/tmwa/mail2handler.cpp | 5 +++++ src/net/tmwa/mail2handler.h | 3 +++ 6 files changed, 34 insertions(+) (limited to 'src/net') diff --git a/src/net/eathena/mail2handler.cpp b/src/net/eathena/mail2handler.cpp index 3ee9f193c..623283617 100644 --- a/src/net/eathena/mail2handler.cpp +++ b/src/net/eathena/mail2handler.cpp @@ -165,4 +165,17 @@ void Mail2Handler::deleteMail(const int openType, outMsg.writeInt64(mailId, "mail id"); } +void Mail2Handler::requestMoney(const int openType, + const int64_t mailId) const +{ + if (packetVersion < 20140326 || + serverVersion < 19) + { + return; + } + createOutPacket(CMSG_MAIL2_REQUEST_MONEY); + outMsg.writeInt64(mailId, "mail id"); + outMsg.writeInt8(openType, "open type"); +} + } // namespace EAthena diff --git a/src/net/eathena/mail2handler.h b/src/net/eathena/mail2handler.h index eec69f3a1..6188f21eb 100644 --- a/src/net/eathena/mail2handler.h +++ b/src/net/eathena/mail2handler.h @@ -56,6 +56,9 @@ class Mail2Handler final : public Net::Mail2Handler void deleteMail(const int openType, const int64_t mailId) const override final; + + void requestMoney(const int openType, + const int64_t mailId) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index 12f9a03ce..456ae8ae4 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -325,6 +325,7 @@ packet(CMSG_MAIL2_SEND_MAIL, 0x0000, 0, nullptr); packet(CMSG_MAIL2_NEXT_PAGE, 0x0000, 0, nullptr); packet(CMSG_MAIL2_READ_MAIL, 0x0000, 0, nullptr); packet(CMSG_MAIL2_DELETE_MAIL, 0x0000, 0, nullptr); +packet(CMSG_MAIL2_REQUEST_MONEY, 0x0000, 0, nullptr); #else // 20040713 if (packetVersion >= 20040713) @@ -1330,6 +1331,12 @@ if (packetVersion == 20140305) packet(CMSG_NAME_REQUEST, 0x096a, 6, clif->pGetCharNameRequest); } +// 20140326 +if (packetVersion == 20140326) +{ + packet(CMSG_MAIL2_REQUEST_MONEY, 0x09f1, 11, clif->pRodexRequestZeny); +} + // 20140402 if (packetVersion == 20140402) { diff --git a/src/net/mail2handler.h b/src/net/mail2handler.h index b16d751db..0b824c1d2 100644 --- a/src/net/mail2handler.h +++ b/src/net/mail2handler.h @@ -62,6 +62,9 @@ class Mail2Handler notfinal virtual void deleteMail(const int openType, const int64_t mailId) const = 0; + + virtual void requestMoney(const int openType, + const int64_t mailId) const = 0; }; } // namespace Net diff --git a/src/net/tmwa/mail2handler.cpp b/src/net/tmwa/mail2handler.cpp index ce80e1893..5017e0716 100644 --- a/src/net/tmwa/mail2handler.cpp +++ b/src/net/tmwa/mail2handler.cpp @@ -71,4 +71,9 @@ void Mail2Handler::deleteMail(const int openType A_UNUSED, { } +void Mail2Handler::requestMoney(const int openType A_UNUSED, + const int64_t mailId A_UNUSED) const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/mail2handler.h b/src/net/tmwa/mail2handler.h index cae94d788..5df6370df 100644 --- a/src/net/tmwa/mail2handler.h +++ b/src/net/tmwa/mail2handler.h @@ -56,6 +56,9 @@ class Mail2Handler final : public Net::Mail2Handler void deleteMail(const int openType, const int64_t mailId) const override final; + + void requestMoney(const int openType, + const int64_t mailId) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-60-g2f50