* Added HandleGMNameAnnounceCommand

--HG--
branch : trunk

4 files changed, 14 insertions, 1 deletions

diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 30946f7b7da..203f8f6c624 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -532,6 +532,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "aura",           SEC_ADMINISTRATOR,  false, &ChatHandler::HandleAuraCommand,                "", NULL },
         { "unaura",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleUnAuraCommand,              "", NULL },
         { "nameannounce",   SEC_MODERATOR,      false, &ChatHandler::HandleNameAnnounceCommand,        "", NULL }, 
+        { "gmnameannounce", SEC_MODERATOR,      false, &ChatHandler::HandleGMNameAnnounceCommand,      "", NULL },
         { "announce",       SEC_MODERATOR,      true,  &ChatHandler::HandleAnnounceCommand,            "", NULL },
         { "gmannounce",     SEC_MODERATOR,      true,  &ChatHandler::HandleGMAnnounceCommand,          "", NULL },
         { "notify",         SEC_MODERATOR,      true,  &ChatHandler::HandleNotifyCommand,              "", NULL },
diff --git a/src/game/Chat.h b/src/game/Chat.h
index b62a0dd793a..16f764366ac 100644
--- a/src/game/Chat.h
+++ b/src/game/Chat.h
@@ -110,6 +110,7 @@ class ChatHandler
         bool HandleGroupgoCommand(const char* args);
         bool HandleRecallCommand(const char* args);
         bool HandleNameAnnounceCommand(const char* args);
+        bool HandleGMNameAnnounceCommand(const char* args);
         bool HandleAnnounceCommand(const char* args);
         bool HandleGMAnnounceCommand(const char* args);
         bool HandleNotifyCommand(const char* args);
diff --git a/src/game/Language.h b/src/game/Language.h
index a36bde5f439..be6401596ea 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -779,7 +779,8 @@ enum TrinityStrings
     // Room for more Trinity strings      5010-9999
     // Used for GM Announcements        
     LANG_GM_BROADCAST                    = 6613,
-    LANG_GM_NOTIFY                        = 6614,
+    LANG_GM_NOTIFY                       = 6614,
+    LANG_GM_ANNOUNCE_COLOR               = 6615,
 
     // Use for not-in-offcial-sources patches
     //                                    10000-10999
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index e1af5f0b08e..000c7bc241e 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -129,6 +129,16 @@ bool ChatHandler::HandleNameAnnounceCommand(const char* args)
     return true;
 }
 
+bool ChatHandler::HandleGMNameAnnounceCommand(const char* args)
+{
+    WorldPacket data;
+    if(!*args)
+        return false;
+   
+    sWorld.SendGMText(LANG_GM_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args);
+    return true;
+}
+
 // global announce
 bool ChatHandler::HandleAnnounceCommand(const char* args)
 {