From e40ff3205395015708b4801a984c25f239089f50 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 18 May 2018 20:16:00 +0300 Subject: Add packet CMSG_MAP_BLOCK_PLAY_CANCEL 0x0447. --- src/net/eathena/maphandler.cpp | 8 ++++++++ src/net/eathena/maphandler.h | 2 ++ src/net/eathena/packetsout.inc | 7 +++++++ src/net/maphandler.h | 2 ++ src/net/tmwa/maphandler.cpp | 4 ++++ src/net/tmwa/maphandler.h | 2 ++ 6 files changed, 25 insertions(+) diff --git a/src/net/eathena/maphandler.cpp b/src/net/eathena/maphandler.cpp index 760a5c458..8136fdb79 100644 --- a/src/net/eathena/maphandler.cpp +++ b/src/net/eathena/maphandler.cpp @@ -20,6 +20,9 @@ #include "net/eathena/maphandler.h" +#include "net/eathena/messageout.h" +#include "net/eathena/protocolout.h" + #include "debug.h" namespace EAthena @@ -36,4 +39,9 @@ MapHandler::~MapHandler() mapHandler = nullptr; } +void MapHandler::blockPlayCancel() const +{ + createOutPacket(CMSG_MAP_BLOCK_PLAY_CANCEL); +} + } // namespace EAthena diff --git a/src/net/eathena/maphandler.h b/src/net/eathena/maphandler.h index 277bbce86..d87947f78 100644 --- a/src/net/eathena/maphandler.h +++ b/src/net/eathena/maphandler.h @@ -34,6 +34,8 @@ class MapHandler final : public Net::MapHandler A_DELETE_COPY(MapHandler) ~MapHandler() override final; + + void blockPlayCancel() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index ef9ce6c14..34ac2b436 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -333,6 +333,7 @@ packet(CMSG_MAIL2_CANCEL_WRITE_MAIL, 0x0000, 0, nullptr); packet(CMSG_CLAN_MESSAGE, 0x0000, 0, nullptr); packet(CMSG_WINDOW_OPEN_REQUEST2, 0x0000, 0, nullptr); packet(CMSG_ATTENDANCE_REWARD, 0x0000, 0, nullptr); +packet(CMSG_MAP_BLOCK_PLAY_CANCEL, 0x0000, 0, nullptr); #else // 20040713 if (packetVersion >= 20040713) @@ -564,6 +565,12 @@ if (packetVersion >= 20081210) packet(CMSG_SKILL_SELECT_MENU, 0x0443, 8, clif->pSkillSelectMenu); } +// 20090520 +if (packetVersion >= 20090520) +{ + packet(CMSG_MAP_BLOCK_PLAY_CANCEL, 0x0447, 2, clif->p_cz_blocking_play_cancel); +} + // 20090603 if (packetVersion >= 20090603) { diff --git a/src/net/maphandler.h b/src/net/maphandler.h index 34a5243b6..a1c1db6f9 100644 --- a/src/net/maphandler.h +++ b/src/net/maphandler.h @@ -36,6 +36,8 @@ class MapHandler notfinal virtual ~MapHandler() { } + + virtual void blockPlayCancel() const = 0; }; } // namespace Net diff --git a/src/net/tmwa/maphandler.cpp b/src/net/tmwa/maphandler.cpp index 62918ebfc..a3b7e005f 100644 --- a/src/net/tmwa/maphandler.cpp +++ b/src/net/tmwa/maphandler.cpp @@ -36,4 +36,8 @@ MapHandler::~MapHandler() mapHandler = nullptr; } +void MapHandler::blockPlayCancel() const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/maphandler.h b/src/net/tmwa/maphandler.h index 565544061..6b35673e6 100644 --- a/src/net/tmwa/maphandler.h +++ b/src/net/tmwa/maphandler.h @@ -34,6 +34,8 @@ class MapHandler final : public Net::MapHandler A_DELETE_COPY(MapHandler) ~MapHandler() override final; + + void blockPlayCancel() const override final; }; } // namespace TmwAthena -- cgit v1.2.3-70-g09d2