summaryrefslogtreecommitdiff
path: root/src/net/tmwa/chatrecv.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-04 01:26:47 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-04 01:26:47 +0300
commit8356efd659046630db247b344bb4baec29c4a6e7 (patch)
treeb0758791b4f0856856536556d0e99f1ef08bf3bb /src/net/tmwa/chatrecv.cpp
parentad65d5b7ee4e206733add9e5514a7d51e02c2d54 (diff)
downloadplus-8356efd659046630db247b344bb4baec29c4a6e7.tar.gz
plus-8356efd659046630db247b344bb4baec29c4a6e7.tar.bz2
plus-8356efd659046630db247b344bb4baec29c4a6e7.tar.xz
plus-8356efd659046630db247b344bb4baec29c4a6e7.zip
Remove some useless includes.
Diffstat (limited to 'src/net/tmwa/chatrecv.cpp')
-rw-r--r--src/net/tmwa/chatrecv.cpp53
1 files changed, 1 insertions, 52 deletions
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index 561511041..a768dab2e 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -43,7 +43,6 @@
#include "net/messagein.h"
#include "net/tmwa/guildmanager.h"
-#include "net/tmwa/protocol.h"
#include "debug.h"
@@ -123,7 +122,6 @@ void ChatRecv::processChatContinue(std::string chatMsg,
void ChatRecv::processGmChat(Net::MessageIn &msg)
{
BLOCK_START("ChatRecv::processChat")
- const bool normalChat = msg.getId() == SMSG_PLAYER_CHAT;
int chatMsgLength = msg.readInt16("len") - 4;
if (chatMsgLength <= 0)
{
@@ -132,57 +130,8 @@ void ChatRecv::processGmChat(Net::MessageIn &msg)
}
std::string chatMsg = msg.readRawString(chatMsgLength, "message");
- const size_t pos = chatMsg.find(" : ", 0);
-
- if (normalChat)
- {
- bool allow(true);
- if (chatWindow)
- {
- allow = chatWindow->resortChatLog(chatMsg,
- ChatMsgType::BY_PLAYER,
- GENERAL_CHANNEL,
- IgnoreRecord_false,
- TryRemoveColors_true);
- }
-
- const std::string senseStr("You sense the following: ");
- if (actorManager && !chatMsg.find(senseStr))
- {
- actorManager->parseLevels(
- chatMsg.substr(senseStr.size()));
- }
- if (pos == std::string::npos &&
- !Ea::ChatRecv::mShowMotd &&
- Ea::ChatRecv::mSkipping)
- {
- // skip motd from "new" tmw server
- if (Ea::ChatRecv::mMotdTime == -1)
- {
- Ea::ChatRecv::mMotdTime = cur_time + 1;
- }
- else if (Ea::ChatRecv::mMotdTime == cur_time ||
- Ea::ChatRecv::mMotdTime < cur_time)
- {
- Ea::ChatRecv::mSkipping = false;
- }
- BLOCK_END("ChatRecv::processChat")
- return;
- }
-
- if (pos != std::string::npos)
- chatMsg.erase(0, pos + 3);
-
- trim(chatMsg);
-
- if (localPlayer)
- {
- if ((chatWindow || Ea::ChatRecv::mShowMotd) && allow)
- localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
- }
- }
- else if (localChatTab)
+ if (localChatTab)
{
if (chatWindow)
chatWindow->addGlobalMessage(chatMsg);