summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-03 20:33:28 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-03 20:33:28 +0300
commit36574fe72662e807ec679e6f54a32685ee23ee57 (patch)
tree9cd651612dc731b98e271b0d59d8e4b218280819 /src/net
parentd9fd0f7fad79d8f285fe399322e81c48b02fb0b4 (diff)
downloadManaVerse-36574fe72662e807ec679e6f54a32685ee23ee57.tar.gz
ManaVerse-36574fe72662e807ec679e6f54a32685ee23ee57.tar.bz2
ManaVerse-36574fe72662e807ec679e6f54a32685ee23ee57.tar.xz
ManaVerse-36574fe72662e807ec679e6f54a32685ee23ee57.zip
allow special server messgaes before motd if motd is hidden.
Also always show motd in debug tab.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/chathandler.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 0c34291c4..6346f63ff 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -335,15 +335,6 @@ void ChatHandler::processChat(Net::MessageIn &msg, const bool normalChat,
if (normalChat)
{
- if (chatMsg.find(": ") == std::string::npos && !mShowMotd
- && mSkipping && channel.empty())
- {
- // skip motd from "new" tmw server
- return;
- }
-
- mSkipping = true;
-
if (chatWindow)
{
chatWindow->resortChatLog(chatMsg, BY_PLAYER,
@@ -360,6 +351,15 @@ void ChatHandler::processChat(Net::MessageIn &msg, const bool normalChat,
}
}
+ if (chatMsg.find(": ") == std::string::npos && !mShowMotd
+ && mSkipping && channel.empty())
+ {
+ // skip motd from "new" tmw server
+ return;
+ }
+
+ mSkipping = false;
+
if (pos != std::string::npos)
chatMsg.erase(0, pos + 3);