From 05e753294c1a603252d2eed4b1731c3f50543a7e Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 27 Mar 2009 12:35:09 +0100 Subject: Fixed some compiler warnings Fixed a faulty == statement that should have been an assignment and a mismatched 'else' block. --- src/net/ea/chathandler.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 2e7be21f..14432b28 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -35,7 +35,6 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include #include extern Being *player_node; @@ -93,10 +92,14 @@ void ChatHandler::handleMessage(MessageIn &msg) chatMsg = msg.readString(chatMsgLength); if (nick != SERVER_NAME) + { if (player_relations.hasPermission(nick, PlayerRelation::WHISPER)) chatWindow->whisper(nick, chatMsg); + } else + { localChatTab->chatLog(chatMsg, BY_SERVER); + } break; @@ -106,9 +109,7 @@ void ChatHandler::handleMessage(MessageIn &msg) being = beingManager->findBeing(msg.readInt32()); if (!being || chatMsgLength <= 0) - { break; - } chatMsg = msg.readString(chatMsgLength); @@ -135,9 +136,7 @@ void ChatHandler::handleMessage(MessageIn &msg) chatMsgLength = msg.readInt16() - 4; if (chatMsgLength <= 0) - { break; - } chatMsg = msg.readString(chatMsgLength); std::string::size_type pos = chatMsg.find(" : ", 0); -- cgit v1.2.3-70-g09d2