* merge

--HG--
branch : trunk

1 files changed, 36 insertions, 0 deletions

diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index 002b7c9aa3a..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)
 {
@@ -139,6 +149,16 @@ bool ChatHandler::HandleAnnounceCommand(const char* args)
     return true;
 }
 
+// announce to logged in GMs
+bool ChatHandler::HandleGMAnnounceCommand(const char* args)
+{
+    if(!*args)
+        return false;
+
+    sWorld.SendGMText(LANG_GM_BROADCAST,args);
+    return true;
+}
+
 //notification player at the screen
 bool ChatHandler::HandleNotifyCommand(const char* args)
 {
@@ -155,6 +175,22 @@ bool ChatHandler::HandleNotifyCommand(const char* args)
     return true;
 }
 
+//notification GM at the screen
+bool ChatHandler::HandleGMNotifyCommand(const char* args)
+{
+    if(!*args)
+        return false;
+
+    std::string str = GetTrinityString(LANG_GM_NOTIFY);
+    str += args;
+
+    WorldPacket data(SMSG_NOTIFICATION, (str.size()+1));
+    data << str;
+    sWorld.SendGlobalGMMessage(&data);
+
+    return true;
+}
+
 //Enable\Dissable GM Mode
 bool ChatHandler::HandleGMmodeCommand(const char* args)
 {