From dc3ff5e5f2eaaeba0b0daabff088a3950ddc8508 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 11 May 2011 10:05:26 +0200 Subject: Core/Chat Commands: Partly revert "add name of GM (or Console) into output of gmannounce command (and also fix typo from previous commit)" as .gmnameannounce does exactly that Core/Chat Commands: Allowed named announcement commands to run from console This reverts commit 574f55382a8212333009322c774e2af0518e50a8. --- src/server/game/Chat/Commands/Level1.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/server/game/Chat/Commands') diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp index 8b234aa3921..71b915f9d53 100755 --- a/src/server/game/Chat/Commands/Level1.cpp +++ b/src/server/game/Chat/Commands/Level1.cpp @@ -46,7 +46,11 @@ bool ChatHandler::HandleNameAnnounceCommand(const char* args) if (!*args) return false; - sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args); + std::string name("Console"); + if (WorldSession* session = GetSession()) + name = session->GetPlayer()->GetName(); + + sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, name.c_str(), args); return true; } @@ -56,7 +60,11 @@ bool ChatHandler::HandleGMNameAnnounceCommand(const char* args) if (!*args) return false; - sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args); + std::string name("Console"); + if (WorldSession* session = GetSession()) + name = session->GetPlayer()->GetName(); + + sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, name.c_str(), args); return true; } @@ -78,11 +86,7 @@ bool ChatHandler::HandleGMAnnounceCommand(const char* args) if (!*args) return false; - std::string name("Console"); - if (Player* _player = m_session->GetPlayer()) - name = _player->GetName(); - - sWorld->SendGMText(LANG_GM_BROADCAST, name.c_str(), args); + sWorld->SendGMText(LANG_GM_BROADCAST, args); return true; } -- cgit v1.2.3