From 8168e7144c6dcf6b945c14ae811b5cd9691cf844 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Tue, 31 Mar 2009 10:01:21 +0200 Subject: [PATCH] * Some changes to last commit. This must be the correct way. --HG-- branch : trunk --- src/game/ChatHandler.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index 0820c500ab..398a871d94 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -499,21 +499,16 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data ) { chn->Say(_player->GetGUID(),msg.c_str(),lang); - if(chn->HasFlag(CHANNEL_FLAG_TRADE) || + if((chn->HasFlag(CHANNEL_FLAG_TRADE) || chn->HasFlag(CHANNEL_FLAG_GENERAL) || chn->HasFlag(CHANNEL_FLAG_CITY) || - chn->HasFlag(CHANNEL_FLAG_LFG)) - { - if(sWorld.getConfig(CONFIG_CHATLOG_SYSCHAN)) + chn->HasFlag(CHANNEL_FLAG_LFG)) && + sWorld.getConfig(CONFIG_CHATLOG_SYSCHAN)) sLog.outChat("[SYSCHAN] Player %s tells channel %s: %s", GetPlayer()->GetName(), chn->GetName().c_str(), msg.c_str()); - } - else - { - if(sWorld.getConfig(CONFIG_CHATLOG_CHANNEL)) + else if(sWorld.getConfig(CONFIG_CHATLOG_CHANNEL)) sLog.outChat("[CHANNEL] Player %s tells channel %s: %s", GetPlayer()->GetName(), chn->GetName().c_str(), msg.c_str()); - } } } } break;