From 0f4c817e7b234c9be9dce9ff27e98a1dd0209ad1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 19 Apr 2016 22:47:12 +0300 Subject: Add packet CMSG_SKILL_FEEL_SAVE_OK 0x0254 --- src/net/eathena/packetsout.inc | 7 +++++++ src/net/eathena/skillhandler.cpp | 11 +++++++++++ src/net/eathena/skillhandler.h | 2 ++ src/net/skillhandler.h | 2 ++ src/net/tmwa/skillhandler.cpp | 4 ++++ src/net/tmwa/skillhandler.h | 2 ++ 6 files changed, 28 insertions(+) diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index ceae04c94..032f9f3ab 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -287,6 +287,7 @@ packet(CMSG_BUYINGSTORE_OPEN, 0x0000, 0, nullptr); packet(CMSG_SEARCHSTORE_NEXT_PAGE, 0x0000, 0, nullptr); packet(CMSG_QUICK_IDENTIFY_ITEM, 0x0000, 0, nullptr); packet(CMSG_PARTY_INVITE2, 0x0000, 0, nullptr); +packet(CMSG_SKILL_FEEL_SAVE_OK, 0x0000, 0, nullptr); #else // 20040726 if (packetVersion >= 20040726) @@ -326,6 +327,12 @@ if (packetVersion >= 20050530) packet(CMSG_PK_RANKS, 0x0237, 2, clif->pRankingPk); } +// 20050817 +if (packetVersion >= 20050817) +{ + packet(CMSG_SKILL_FEEL_SAVE_OK, 0x0254, 3, clif->pFeelSaveOk); +} + // 20090603 if (packetVersion >= 20090603) { diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index 5cc6317a2..70988efd1 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -22,6 +22,7 @@ #include "net/eathena/skillhandler.h" +#include "net/eathena/menu.h" #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" @@ -101,4 +102,14 @@ void SkillHandler::getPkRanks() const } } +void SkillHandler::feelSaveOk(const int which) const +{ + if (packetVersion >= 20050817) + { + createOutPacket(CMSG_SKILL_FEEL_SAVE_OK); + outMsg.writeInt8(CAST_S8(which), "which"); + menu = MenuType::Unknown; + } +} + } // namespace EAthena diff --git a/src/net/eathena/skillhandler.h b/src/net/eathena/skillhandler.h index 77fc6dadb..5ef9c77d1 100644 --- a/src/net/eathena/skillhandler.h +++ b/src/net/eathena/skillhandler.h @@ -55,6 +55,8 @@ class SkillHandler final : public Ea::SkillHandler void getBlacksmithRanks() const override final; void getPkRanks() const override final; + + void feelSaveOk(const int which) const override final; }; } // namespace EAthena diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h index b8acb7ccb..29e46a2ff 100644 --- a/src/net/skillhandler.h +++ b/src/net/skillhandler.h @@ -57,6 +57,8 @@ class SkillHandler notfinal virtual void getBlacksmithRanks() const = 0; virtual void getPkRanks() const = 0; + + virtual void feelSaveOk(const int which) const = 0; }; } // namespace Net diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp index 074961437..3faeeb718 100644 --- a/src/net/tmwa/skillhandler.cpp +++ b/src/net/tmwa/skillhandler.cpp @@ -88,4 +88,8 @@ void SkillHandler::getPkRanks() const { } +void SkillHandler::feelSaveOk(const int which A_UNUSED) const +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h index ade623df2..a63633ec1 100644 --- a/src/net/tmwa/skillhandler.h +++ b/src/net/tmwa/skillhandler.h @@ -55,6 +55,8 @@ class SkillHandler final : public Ea::SkillHandler void getBlacksmithRanks() const override final; void getPkRanks() const override final; + + void feelSaveOk(const int which) const override final; }; } // namespace TmwAthena -- cgit v1.2.3-60-g2f50