diff options
| -rw-r--r-- | sql/base/world_database.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2011_05_11_01_world_trinity_string.sql | 1 | ||||
| -rwxr-xr-x | src/server/game/Chat/Chat.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Chat/Commands/Level1.cpp | 18 | ||||
| -rwxr-xr-x | src/server/game/World/World.cpp | 2 |
5 files changed, 16 insertions, 11 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index ad309435ac2..992a29a95ac 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -27723,7 +27723,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_ (6610, 'You cannot trade with characters lower than level %d.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6611, 'You cannot send mail until you become level %d.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6612, 'You cannot send mail to characters lower than level %d.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(6613, '|cfff00000[GM Announcement by [%s]]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(6613, '|cfff00000[GM Announcement]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6614, 'Notification to GM''s - ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6615, '|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (6616, 'Silence is ON for %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), diff --git a/sql/updates/world/2011_05_11_01_world_trinity_string.sql b/sql/updates/world/2011_05_11_01_world_trinity_string.sql new file mode 100644 index 00000000000..c7ea8605bbf --- /dev/null +++ b/sql/updates/world/2011_05_11_01_world_trinity_string.sql @@ -0,0 +1 @@ +UPDATE `trinity_string` SET `content_default`='|cfff00000[GM Announcement]: %s|r' WHERE `entry`=6613; diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 32da0947aff..ff6c16ec554 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -347,8 +347,8 @@ ChatCommand * ChatHandler::getCommandTable() { "aura", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleAuraCommand>, "", NULL }, { "unaura", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleUnAuraCommand>, "", NULL }, - { "nameannounce", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleNameAnnounceCommand>, "", NULL }, - { "gmnameannounce", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleGMNameAnnounceCommand>, "", NULL }, + { "nameannounce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleNameAnnounceCommand>, "", NULL }, + { "gmnameannounce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleGMNameAnnounceCommand>, "", NULL }, { "announce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleAnnounceCommand>, "", NULL }, { "gmannounce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleGMAnnounceCommand>, "", NULL }, { "notify", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleNotifyCommand>, "", NULL }, 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; } diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 143c1cc3480..0c2703edd41 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2538,7 +2538,7 @@ void World::ProcessCliCommands() callbackArg = command->m_callbackArg; CliHandler handler(callbackArg, zprint); handler.ParseCommands(command->m_command); - if(command->m_commandFinished) + if (command->m_commandFinished) command->m_commandFinished(callbackArg, !handler.HasSentErrorMessage()); delete command; } |