diff options
Diffstat (limited to 'src/game/Level3.cpp')
| -rw-r--r-- | src/game/Level3.cpp | 183 |
1 files changed, 94 insertions, 89 deletions
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 5aaa62c71ed..a0b44c81f3a 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -2204,13 +2204,11 @@ bool ChatHandler::HandleLearnAllLangCommand(const char* /*args*/) bool ChatHandler::HandleLearnAllDefaultCommand(const char* args) { - char* pName = strtok((char*)args, ""); Player *player = NULL; - if (pName) + if (*args) { - std::string name = pName; - - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink((char*)args); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -2232,7 +2230,9 @@ bool ChatHandler::HandleLearnAllDefaultCommand(const char* args) player->learnDefaultSpells(); player->learnQuestRewardedSpells(); - PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,player->GetName()); + std::string nameLink = playerLink(player->GetName()); + + PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,nameLink.c_str()); return true; } @@ -3518,11 +3518,11 @@ bool ChatHandler::HandleGuildInviteCommand(const char *args) if (!targetGuild) return false; - std::string plName = par1; - if (!normalizePlayerName (plName)) + std::string plName = extractPlayerNameFromLink(par1); + if(plName.empty()) { - SendSysMessage (LANG_PLAYER_NOT_FOUND); - SetSentErrorMessage (true); + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); return false; } @@ -3530,7 +3530,7 @@ bool ChatHandler::HandleGuildInviteCommand(const char *args) if (Player* targetPlayer = ObjectAccessor::Instance ().FindPlayerByName (plName.c_str ())) plGuid = targetPlayer->GetGUID (); else - plGuid = objmgr.GetPlayerGUIDByName (plName.c_str ()); + plGuid = objmgr.GetPlayerGUIDByName (plName); if (!plGuid) false; @@ -3551,11 +3551,11 @@ bool ChatHandler::HandleGuildUninviteCommand(const char *args) if(!par1) return false; - std::string plName = par1; - if (!normalizePlayerName (plName)) + std::string plName = extractPlayerNameFromLink(par1); + if(plName.empty()) { - SendSysMessage (LANG_PLAYER_NOT_FOUND); - SetSentErrorMessage (true); + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); return false; } @@ -3568,7 +3568,7 @@ bool ChatHandler::HandleGuildUninviteCommand(const char *args) } else { - plGuid = objmgr.GetPlayerGUIDByName (plName.c_str ()); + plGuid = objmgr.GetPlayerGUIDByName (plName); glId = Player::GetGuildIdFromDB (plGuid); } @@ -3593,14 +3593,16 @@ bool ChatHandler::HandleGuildRankCommand(const char *args) char* par2 = strtok (NULL, " "); if (!par1 || !par2) return false; - std::string plName = par1; - if (!normalizePlayerName (plName)) + + std::string plName = extractPlayerNameFromLink(par1); + if(plName.empty()) { - SendSysMessage (LANG_PLAYER_NOT_FOUND); - SetSentErrorMessage (true); + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); return false; } + uint64 plGuid = 0; uint32 glId = 0; if (Player* targetPlayer = ObjectAccessor::Instance ().FindPlayerByName (plName.c_str ())) @@ -3610,7 +3612,7 @@ bool ChatHandler::HandleGuildRankCommand(const char *args) } else { - plGuid = objmgr.GetPlayerGUIDByName (plName.c_str ()); + plGuid = objmgr.GetPlayerGUIDByName (plName); glId = Player::GetGuildIdFromDB (plGuid); } @@ -3860,8 +3862,8 @@ bool ChatHandler::HandleReviveCommand(const char* args) if (*args) { - std::string name = args; - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink((char*)args); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -4221,8 +4223,8 @@ bool ChatHandler::HandleLevelUpCommand(const char* args) if(pname) // player by name { - name = pname; - if(!normalizePlayerName(name)) + name = extractPlayerNameFromLink(pname); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -4290,7 +4292,10 @@ bool ChatHandler::HandleLevelUpCommand(const char* args) } if(m_session->GetPlayer() != chr) // including chr==NULL - PSendSysMessage(LANG_YOU_CHANGE_LVL,name.c_str(),newlevel); + { + std::string nameLink = playerLink(name); + PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel); + } return true; } @@ -4748,15 +4753,15 @@ bool ChatHandler::HandleResetHonorCommand (const char * args) Player *player = NULL; if (pName) { - std::string name = pName; - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink(pName); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); return false; } - uint64 guid = objmgr.GetPlayerGUIDByName(name.c_str()); + uint64 guid = objmgr.GetPlayerGUIDByName(name); player = objmgr.GetPlayer(guid); } else @@ -4838,15 +4843,15 @@ bool ChatHandler::HandleResetLevelCommand(const char * args) Player *player = NULL; if (pName) { - std::string name = pName; - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink(pName); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); return false; } - uint64 guid = objmgr.GetPlayerGUIDByName(name.c_str()); + uint64 guid = objmgr.GetPlayerGUIDByName(name); player = objmgr.GetPlayer(guid); } else @@ -4891,15 +4896,15 @@ bool ChatHandler::HandleResetStatsCommand(const char * args) Player *player = NULL; if (pName) { - std::string name = pName; - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink(pName); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); return false; } - uint64 guid = objmgr.GetPlayerGUIDByName(name.c_str()); + uint64 guid = objmgr.GetPlayerGUIDByName(name); player = objmgr.GetPlayer(guid); } else @@ -4931,9 +4936,8 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args) uint64 playerGUID = 0; if (pName) { - std::string name = pName; - - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink(pName); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -4942,7 +4946,7 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args) player = objmgr.GetPlayer(name.c_str()); if(!player) - playerGUID = objmgr.GetPlayerGUIDByName(name.c_str()); + playerGUID = objmgr.GetPlayerGUIDByName(name); } else player = getSelectedPlayer(); @@ -4961,7 +4965,10 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args) ChatHandler(player).SendSysMessage(LANG_RESET_SPELLS); if(m_session->GetPlayer()!=player) - PSendSysMessage(LANG_RESET_SPELLS_ONLINE,player->GetName()); + { + std::string nameLink = playerLink(player->GetName()); + PSendSysMessage(LANG_RESET_SPELLS_ONLINE,nameLink.c_str()); + } } else { @@ -4979,8 +4986,8 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) uint64 playerGUID = 0; if (pName) { - std::string name = pName; - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink(pName); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -4989,7 +4996,7 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) player = objmgr.GetPlayer(name.c_str()); if(!player) - playerGUID = objmgr.GetPlayerGUIDByName(name.c_str()); + playerGUID = objmgr.GetPlayerGUIDByName(name); } else player = getSelectedPlayer(); @@ -5001,13 +5008,17 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) ChatHandler(player).SendSysMessage(LANG_RESET_TALENTS); if(m_session->GetPlayer()!=player) - PSendSysMessage(LANG_RESET_TALENTS_ONLINE,player->GetName()); + { + std::string nameLink = playerLink(player->GetName()); + PSendSysMessage(LANG_RESET_TALENTS_ONLINE,nameLink.c_str()); + } return true; } else if (playerGUID) { CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",uint32(AT_LOGIN_RESET_TALENTS), GUID_LOPART(playerGUID) ); - PSendSysMessage(LANG_RESET_TALENTS_OFFLINE,pName); + std::string nameLink = playerLink(pName); + PSendSysMessage(LANG_RESET_TALENTS_OFFLINE,nameLink.c_str()); return true; } // Try reset talenents as Hunter Pet @@ -5021,7 +5032,10 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args) player = (Player *)owner; ChatHandler(player).SendSysMessage(LANG_RESET_TALENTS); if(m_session->GetPlayer()!=player) - PSendSysMessage(LANG_RESET_TALENTS_ONLINE,player->GetName()); + { + std::string nameLink = playerLink(player->GetName()); + PSendSysMessage(LANG_RESET_TALENTS_ONLINE,nameLink.c_str()); + } } return true; } @@ -5585,12 +5599,8 @@ bool ChatHandler::HandleBanInfoCharacterCommand(const char* args) if(!args) return false; - char* cname = strtok ((char*)args, ""); - if(!cname) - return false; - - std::string name = cname; - if(!normalizePlayerName(name)) + std::string name = extractPlayerNameFromLink((char*)args); + if(name.empty()) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -6090,12 +6100,11 @@ bool ChatHandler::HandleWritePDumpCommand(const char *args) guid = atoi(p2); else { - std::string name = p2; - - if (!normalizePlayerName (name)) + std::string name = extractPlayerNameFromLink(p2); + if(name.empty()) { - SendSysMessage (LANG_PLAYER_NOT_FOUND); - SetSentErrorMessage (true); + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); return false; } @@ -6714,9 +6723,13 @@ bool ChatHandler::HandleSendItemsCommand(const char* args) // format: name "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12] - char* pName = strtok((char*)args, " "); - if(!pName) + std::string name = extractPlayerNameFromLink((char*)args); + if(name.empty()) + { + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); return false; + } char* tail1 = strtok(NULL, ""); if(!tail1) @@ -6754,8 +6767,7 @@ bool ChatHandler::HandleSendItemsCommand(const char* args) if (!msgText) return false; - // pName, msgSubject, msgText isn't NUL after prev. check - std::string name = pName; + // msgSubject, msgText isn't NUL after prev. check std::string subject = msgSubject; std::string text = msgText; @@ -6813,13 +6825,6 @@ bool ChatHandler::HandleSendItemsCommand(const char* args) } } - if(!normalizePlayerName(name)) - { - SendSysMessage(LANG_PLAYER_NOT_FOUND); - SetSentErrorMessage(true); - return false; - } - uint64 receiver_guid = objmgr.GetPlayerGUIDByName(name); if(!receiver_guid) { @@ -6851,7 +6856,8 @@ bool ChatHandler::HandleSendItemsCommand(const char* args) WorldSession::SendMailTo(receiver,messagetype, stationery, sender_guidlo, GUID_LOPART(receiver_guid), subject, itemTextId, &mi, 0, 0, MAIL_CHECK_MASK_NONE); - PSendSysMessage(LANG_MAIL_SENT, name.c_str()); + std::string nameLink = playerLink(name); + PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str()); return true; } @@ -6863,9 +6869,13 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args) /// format: name "subject text" "mail text" money - char* pName = strtok((char*)args, " "); - if (!pName) + std::string name = extractPlayerNameFromLink((char*)args); + if(name.empty()) + { + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); return false; + } char* tail1 = strtok(NULL, ""); if (!tail1) @@ -6908,18 +6918,10 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args) if (money <= 0) return false; - // pName, msgSubject, msgText isn't NUL after prev. check - std::string name = pName; + // msgSubject, msgText isn't NUL after prev. check std::string subject = msgSubject; std::string text = msgText; - if (!normalizePlayerName(name)) - { - SendSysMessage(LANG_PLAYER_NOT_FOUND); - SetSentErrorMessage(true); - return false; - } - uint64 receiver_guid = objmgr.GetPlayerGUIDByName(name); if (!receiver_guid) { @@ -6941,7 +6943,8 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args) WorldSession::SendMailTo(receiver,messagetype, stationery, sender_guidlo, GUID_LOPART(receiver_guid), subject, itemTextId, NULL, money, 0, MAIL_CHECK_MASK_NONE); - PSendSysMessage(LANG_MAIL_SENT, name.c_str()); + std::string nameLink = playerLink(name); + PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str()); return true; } @@ -6949,15 +6952,16 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args) bool ChatHandler::HandleSendMessageCommand(const char* args) { ///- Get the command line arguments - char* name_str = strtok((char*)args, " "); - char* msg_str = strtok(NULL, ""); - - if(!name_str || !msg_str) + std::string name = extractPlayerNameFromLink((char*)args); + if(name.empty()) + { + SendSysMessage(LANG_PLAYER_NOT_FOUND); + SetSentErrorMessage(true); return false; + } - std::string name = name_str; - - if(!normalizePlayerName(name)) + char* msg_str = strtok(NULL, ""); + if(!msg_str) return false; ///- Find the player and check that he is not logging out. @@ -6982,7 +6986,8 @@ bool ChatHandler::HandleSendMessageCommand(const char* args) rPlayer->GetSession()->SendAreaTriggerMessage("|cffff0000[Message from administrator]:|r"); //Confirmation message - PSendSysMessage(LANG_SENDMESSAGE,name.c_str(),msg_str); + std::string nameLink = playerLink(name); + PSendSysMessage(LANG_SENDMESSAGE,nameLink.c_str(),msg_str); return true; } |