diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Chat.cpp | 3 | ||||
| -rw-r--r-- | src/game/Chat.h | 1 | ||||
| -rw-r--r-- | src/game/Language.h | 1 | ||||
| -rw-r--r-- | src/game/Level1.cpp | 11 | ||||
| -rw-r--r-- | src/game/Level3.cpp | 8 |
5 files changed, 23 insertions, 1 deletions
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index ad588c5a18d..c7d83be45ed 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -397,7 +397,8 @@ ChatCommand * ChatHandler::getCommandTable() { "aura", SEC_ADMINISTRATOR, &ChatHandler::HandleAuraCommand, "", NULL }, { "unaura", SEC_ADMINISTRATOR, &ChatHandler::HandleUnAuraCommand, "", NULL }, { "acct", SEC_PLAYER, &ChatHandler::HandleAcctCommand, "", NULL }, - { "announce", SEC_MODERATOR, &ChatHandler::HandleAnnounceCommand, "", NULL }, + { "nameannounce", SEC_MODERATOR, &ChatHandler::HandleNameAnnounceCommand, "", NULL }, + { "announce", SEC_ADMINISTRATOR, &ChatHandler::HandleAnnounceCommand, "", NULL }, { "notify", SEC_MODERATOR, &ChatHandler::HandleNotifyCommand, "", NULL }, { "goname", SEC_MODERATOR, &ChatHandler::HandleGonameCommand, "", NULL }, { "namego", SEC_MODERATOR, &ChatHandler::HandleNamegoCommand, "", NULL }, diff --git a/src/game/Chat.h b/src/game/Chat.h index 28920c4d112..b869d429e11 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -91,6 +91,7 @@ class ChatHandler bool HandleGonameCommand(const char* args); bool HandleGroupgoCommand(const char* args); bool HandleRecallCommand(const char* args); + bool HandleNameAnnounceCommand(const char* args); bool HandleAnnounceCommand(const char* args); bool HandleNotifyCommand(const char* args); bool HandleGMmodeCommand(const char* args); diff --git a/src/game/Language.h b/src/game/Language.h index 4bfe520ee78..d1b96855dad 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -641,6 +641,7 @@ enum MangosStrings LANG_ARENA_TESTING = 745, LANG_AUTO_ANN = 746, + LANG_ANNOUNCE_COLOR = 747, // in game strings LANG_PET_INVALID_NAME = 800, diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index cf4123c2f24..34fe48ee89e 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -117,6 +117,17 @@ bool ChatHandler::HandleNpcWhisperCommand(const char* args) return true; } +bool ChatHandler::HandleNameAnnounceCommand(const char* args) +{ + WorldPacket data; + if(!*args) + return false; + char str[1024]; + //sprintf(str, GetMangosString(LANG_ANNOUNCE_COLOR), m_session->GetPlayer()->GetName(), args); + sWorld.SendWorldText(LANG_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args); + return true; +} + // global announce bool ChatHandler::HandleAnnounceCommand(const char* args) { diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index c79bd3db21e..f860318bb06 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -4853,6 +4853,14 @@ bool ChatHandler::HandleBanListCommand(const char* args) bool ChatHandler::HandleRespawnCommand(const char* /*args*/) { + Unit* target = getSelectedUnit(); + + if(target && target->GetTypeId() == TYPEID_UNIT && target->isDead()) + { + ((Creature*)target)->Respawn(); + return true; + } + Player* pl = m_session->GetPlayer(); CellPair p(MaNGOS::ComputeCellPair(pl->GetPositionX(), pl->GetPositionY())); |