diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-21 14:44:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-21 14:44:03 +0300 |
| commit | ba07ca55476c488504a8d8bf9318f15aab687f12 (patch) | |
| tree | 3907bcceabda445a9fa8498ff92af09df2c11e08 /src/net/eathena/chathandler.cpp | |
| parent | 46d1266f00dfde5d04d7980daea4bab02e77cb69 (diff) | |
| download | manaverse-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.gz manaverse-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.bz2 manaverse-ba07ca55476c488504a8d8bf9318f15aab687f12.tar.xz manaverse-ba07ca55476c488504a8d8bf9318f15aab687f12.zip | |
Fix mercenary removing.
Diffstat (limited to 'src/net/eathena/chathandler.cpp')
| -rw-r--r-- | src/net/eathena/chathandler.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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) |