From 5b907fc3c1c21f69f1b86d4e3c16990dd2bff757 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 21 Sep 2014 17:15:12 +0300 Subject: eathena: add packet SMSG_MERCENARY_ACTION 0x029f. --- src/net/eathena/mercenaryhandler.cpp | 6 ++++++ src/net/eathena/mercenaryhandler.h | 2 ++ src/net/eathena/protocol.h | 2 ++ src/net/mercenaryhandler.h | 2 ++ src/net/tmwa/mercenaryhandler.cpp | 4 ++++ src/net/tmwa/mercenaryhandler.h | 2 ++ 6 files changed, 18 insertions(+) (limited to 'src/net') diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp index b65662afd..541f62cf7 100644 --- a/src/net/eathena/mercenaryhandler.cpp +++ b/src/net/eathena/mercenaryhandler.cpp @@ -180,4 +180,10 @@ void MercenaryHandler::handleMercenaryMessage(const int cmd) } } +void MercenaryHandler::fire() +{ + createOutPacket(SMSG_MERCENARY_ACTION); + outMsg.writeInt8(2, "action"); // delete +} + } // namespace EAthena diff --git a/src/net/eathena/mercenaryhandler.h b/src/net/eathena/mercenaryhandler.h index 39af9605b..7d99ea197 100644 --- a/src/net/eathena/mercenaryhandler.h +++ b/src/net/eathena/mercenaryhandler.h @@ -41,6 +41,8 @@ class MercenaryHandler final : public MessageHandler, void handleMercenaryMessage(const int cmd) override final; + void fire() override final; + protected: void processMercenaryUpdate(Net::MessageIn &msg); diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 6708da931..eda0ddbe8 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -427,4 +427,6 @@ #define CMSG_BANK_WITHDRAW 0x09a9 #define CMSG_BANK_CHECK 0x09ab +#define SMSG_MERCENARY_ACTION 0x029f + #endif // NET_EATHENA_PROTOCOL_H diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h index 69ad75cb6..ab7d4d426 100644 --- a/src/net/mercenaryhandler.h +++ b/src/net/mercenaryhandler.h @@ -35,6 +35,8 @@ class MercenaryHandler notfinal { } virtual void handleMercenaryMessage(const int cmd) = 0; + + virtual void fire() = 0; }; } // namespace Net diff --git a/src/net/tmwa/mercenaryhandler.cpp b/src/net/tmwa/mercenaryhandler.cpp index b0afca919..94f8c7436 100644 --- a/src/net/tmwa/mercenaryhandler.cpp +++ b/src/net/tmwa/mercenaryhandler.cpp @@ -46,4 +46,8 @@ void MercenaryHandler::handleMercenaryMessage(const int cmd A_UNUSED) { } +void MercenaryHandler::fire() +{ +} + } // namespace TmwAthena diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h index 0e795d347..483884d77 100644 --- a/src/net/tmwa/mercenaryhandler.h +++ b/src/net/tmwa/mercenaryhandler.h @@ -39,6 +39,8 @@ class MercenaryHandler final : public MessageHandler, void handleMessage(Net::MessageIn &msg) override final; void handleMercenaryMessage(const int cmd) override final; + + void fire() override final; }; } // namespace TmwAthena -- cgit v1.2.3-60-g2f50