From ba07ca55476c488504a8d8bf9318f15aab687f12 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 21 Sep 2014 14:44:03 +0300 Subject: Fix mercenary removing. --- src/net/eathena/chathandler.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/net/eathena/chathandler.cpp') diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index 028cc68a8..758bd37d4 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -32,6 +32,8 @@ #include "gui/windows/chatwindow.h" +#include "net/mercenaryhandler.h" + #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" @@ -332,7 +334,10 @@ void ChatHandler::processFormatMessage(Net::MessageIn &msg) int msgId = msg.readInt16("msg id"); // +++ here need load message from configuration file const std::string chatMsg = strprintf("Message #%d", msgId); - processChatContinue(chatMsg); + if (msgId >= 1266 && msgId <= 1269) + mercenaryHandler->handleMercenaryMessage(msgId - 1266); + else + processChatContinue(chatMsg); } void ChatHandler::processFormatMessageNumber(Net::MessageIn &msg) -- cgit v1.2.3-60-g2f50