aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2009-03-31 10:01:21 +0200
committerXTZGZoReX <none@none>2009-03-31 10:01:21 +0200
commit8168e7144c6dcf6b945c14ae811b5cd9691cf844 (patch)
treed51babb108c59584201cd0f2ee07e11c08b5b0d1 /src
parent6f5efa3c7aa32c463fe0dae78a86a78f80cf1d1b (diff)
* Some changes to last commit. This must be the correct way.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/ChatHandler.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index 0820c500ab6..398a871d946 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;