summaryrefslogtreecommitdiff
path: root/src/net/eathena/chatrecv.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-29 16:56:45 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-29 16:56:45 +0300
commit973606a6dbd201050b7d4cd0a6a782ff742056f6 (patch)
tree4f951409d7dbde5eb201bf3c6b46f777c3ce39b8 /src/net/eathena/chatrecv.cpp
parentd528e58cdbd306a828882eb68855e81dda2a3e62 (diff)
downloadmanaplus-973606a6dbd201050b7d4cd0a6a782ff742056f6.tar.gz
manaplus-973606a6dbd201050b7d4cd0a6a782ff742056f6.tar.bz2
manaplus-973606a6dbd201050b7d4cd0a6a782ff742056f6.tar.xz
manaplus-973606a6dbd201050b7d4cd0a6a782ff742056f6.zip
Fix code style.
Diffstat (limited to 'src/net/eathena/chatrecv.cpp')
-rw-r--r--src/net/eathena/chatrecv.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp
index f058593c9..40281384a 100644
--- a/src/net/eathena/chatrecv.cpp
+++ b/src/net/eathena/chatrecv.cpp
@@ -38,13 +38,11 @@
#include "gui/widgets/tabs/chat/chattab.h"
-#include "net/serverfeatures.h"
+#include "net/messagein.h"
#include "net/ea/chatrecv.h"
#include "net/eathena/mercenaryrecv.h"
-#include "net/eathena/messageout.h"
-#include "net/eathena/protocol.h"
#include "resources/chatobject.h"
#include "utils/gettext.h"
@@ -52,8 +50,6 @@
#include "debug.h"
-extern Net::ChatHandler *chatHandler;
-
namespace EAthena
{
@@ -239,7 +235,7 @@ std::string ChatRecv::extractChannelFromMessage(std::string &chatMsg)
}
void ChatRecv::processChatContinue(std::string chatMsg,
- ChatMsgTypeT own)
+ ChatMsgTypeT own)
{
const std::string channel = extractChannelFromMessage(chatMsg);
bool allow(true);
@@ -466,7 +462,7 @@ void ChatRecv::processJoinChannel(Net::MessageIn &msg)
}
void ChatRecv::processWhisperContinue(const std::string &nick,
- std::string chatMsg)
+ std::string chatMsg)
{
// ignoring future whisper messages
if (chatMsg.find("\302\202G") == 0 || chatMsg.find("\302\202A") == 0)