mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10811] Use ObjectGuids in chat commands.

Browse source 
Still exist 15 GUID_LOPART uses in code.
This commit is contained in:
VladimirMangos 2010-12-02 07:07:47 +03:00
parent c6d3c5e0d6
commit b305f203b9
15 changed files with 151 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/game/Level3.cpp
View file

@ -3543,7 +3543,7 @@ bool ChatHandler::HandleGuildInviteCommand(char *args)
char* nameStr = ExtractOptNotLastArg(&args);
// if not guild name only (in "") then player name
uint64 target_guid;
ObjectGuid target_guid;
if (!ExtractPlayerTarget(&nameStr, NULL, &target_guid))
return false;
@ -3566,7 +3566,7 @@ bool ChatHandler::HandleGuildInviteCommand(char *args)
bool ChatHandler::HandleGuildUninviteCommand(char *args)
{
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
if (!ExtractPlayerTarget(&args, &target, &target_guid))
return false;
@ -3587,7 +3587,7 @@ bool ChatHandler::HandleGuildRankCommand(char *args)
char* nameStr = ExtractOptNotLastArg(&args);
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
std::string target_name;
if (!ExtractPlayerTarget(&nameStr, &target, &target_guid, &target_name))
return false;
@ -3682,7 +3682,7 @@ bool ChatHandler::HandleDieCommand(char* /*args*/)
if(target->GetTypeId()==TYPEID_PLAYER)
{
if(HasLowerSecurity((Player*)target,0,false))
if (HasLowerSecurity((Player*)target, ObjectGuid(), false))
return false;
}
@ -3796,7 +3796,7 @@ bool ChatHandler::HandleModifyArenaCommand(char* args)
bool ChatHandler::HandleReviveCommand(char* args)
{
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
if (!ExtractPlayerTarget(&args, &target, &target_guid))
return false;
@ -4231,7 +4231,7 @@ bool ChatHandler::HandleHoverCommand(char* args)
return true;
}
void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint32 oldlevel, uint32 newlevel)
void ChatHandler::HandleCharacterLevel(Player* player, ObjectGuid player_guid, uint32 oldlevel, uint32 newlevel)
{
if(player)
{
@ -4252,7 +4252,7 @@ void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint3
else
{
// update level and XP at level, all other will be updated at loading
CharacterDatabase.PExecute("UPDATE characters SET level = '%u', xp = 0 WHERE guid = '%u'", newlevel, GUID_LOPART(player_guid));
CharacterDatabase.PExecute("UPDATE characters SET level = '%u', xp = 0 WHERE guid = '%u'", newlevel, player_guid.GetCounter());
}
}
@ -4278,7 +4278,7 @@ bool ChatHandler::HandleCharacterLevelCommand(char* args)
}
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
std::string target_name;
if (!ExtractPlayerTarget(&nameStr, &target, &target_guid, &target_name))
return false;
@ -4324,7 +4324,7 @@ bool ChatHandler::HandleLevelUpCommand(char* args)
}
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
std::string target_name;
if (!ExtractPlayerTarget(&nameStr, &target, &target_guid, &target_name))
return false;
@ -4338,7 +4338,7 @@ bool ChatHandler::HandleLevelUpCommand(char* args)
if (newlevel > STRONG_MAX_LEVEL) // hardcoded maximum level
newlevel = STRONG_MAX_LEVEL;
HandleCharacterLevel(target,target_guid,oldlevel,newlevel);
HandleCharacterLevel(target, target_guid, oldlevel, newlevel);
if (!m_session || m_session->GetPlayer() != target) // including chr==NULL
{
@ -4677,14 +4677,14 @@ bool ChatHandler::HandleListTalentsCommand(char* /*args*/)
bool ChatHandler::HandleResetAchievementsCommand(char* args)
{
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
if (!ExtractPlayerTarget(&args, &target, &target_guid))
return false;
if(target)
target->GetAchievementMgr().Reset();
else
AchievementMgr::DeleteFromDB(GUID_LOPART(target_guid));
AchievementMgr::DeleteFromDB(target_guid);
return true;
}
@ -4797,7 +4797,7 @@ bool ChatHandler::HandleResetStatsCommand(char* args)
bool ChatHandler::HandleResetSpellsCommand(char* args)
{
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
std::string target_name;
if (!ExtractPlayerTarget(&args, &target, &target_guid, &target_name))
return false;
@ -4812,7 +4812,7 @@ bool ChatHandler::HandleResetSpellsCommand(char* args)
}
else
{
CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",uint32(AT_LOGIN_RESET_SPELLS), GUID_LOPART(target_guid));
CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",uint32(AT_LOGIN_RESET_SPELLS), target_guid.GetCounter());
PSendSysMessage(LANG_RESET_SPELLS_OFFLINE,target_name.c_str());
}
@ -4822,7 +4822,7 @@ bool ChatHandler::HandleResetSpellsCommand(char* args)
bool ChatHandler::HandleResetSpecsCommand(char* args)
{
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
std::string target_name;
if (!ExtractPlayerTarget(&args, &target, &target_guid, &target_name))
return false;
@ -4841,10 +4841,10 @@ bool ChatHandler::HandleResetSpecsCommand(char* args)
target->SendTalentsInfoData(true);
return true;
}
else if (target_guid)
else if (!target_guid.IsEmpty())
{
uint32 at_flags = AT_LOGIN_RESET_TALENTS | AT_LOGIN_RESET_PET_TALENTS;
CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'", at_flags, GUID_LOPART(target_guid) );
CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'", at_flags, target_guid.GetCounter());
std::string nameLink = playerLink(target_name);
PSendSysMessage(LANG_RESET_TALENTS_OFFLINE, nameLink.c_str());
return true;
@ -5379,7 +5379,7 @@ bool ChatHandler::HandleBanInfoAccountCommand(char* args)
bool ChatHandler::HandleBanInfoCharacterCommand(char* args)
{
Player* target;
uint64 target_guid;
ObjectGuid target_guid;
if (!ExtractPlayerTarget(&args, &target, &target_guid))
return false;
@ -6474,7 +6474,7 @@ bool ChatHandler::HandleSendItemsCommand(char* args)
{
// format: name "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12]
Player* receiver;
uint64 receiver_guid;
ObjectGuid receiver_guid;
std::string receiver_name;
if (!ExtractPlayerTarget(&args, &receiver, &receiver_guid, &receiver_name))
return false;
@ -6572,7 +6572,7 @@ bool ChatHandler::HandleSendMoneyCommand(char* args)
/// format: name "subject text" "mail text" money
Player* receiver;
uint64 receiver_guid;
ObjectGuid receiver_guid;
std::string receiver_name;
if (!ExtractPlayerTarget(&args, &receiver, &receiver_guid, &receiver_name))
return false;