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

[11465] non-ObjectGuid guids in random places.

Browse source 
Only ChannelMgr code wide use uint64 guids now, and Map object stores.
This commit is contained in:
VladimirMangos 2011-05-10 21:24:43 +04:00
parent a925db80fa
commit ef6a48fe03
44 changed files with 219 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/game/Player.cpp
View file

@ -4649,7 +4649,7 @@ void Player::SpawnCorpseBones()
Corpse* Player::GetCorpse() const
{
return sObjectAccessor.GetCorpseForPlayerGUID(GetGUID());
return sObjectAccessor.GetCorpseForPlayerGUID(GetObjectGuid());
}
void Player::DurabilityLossAll(double percent, bool inventory)
@ -8700,7 +8700,7 @@ void Player::SendPetSkillWipeConfirm()
if(!pet)
return;
WorldPacket data(SMSG_PET_UNLEARN_CONFIRM, (8+4));
data << pet->GetGUID();
data << ObjectGuid(pet->GetObjectGuid());
data << uint32(pet->resetTalentsCost());
GetSession()->SendPacket( &data );
}
@ -13042,7 +13042,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
if (canTalkToCredit)
{
if (pSource->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
TalkedToCreature(pSource->GetEntry(), pSource->GetGUID());
TalkedToCreature(pSource->GetEntry(), pSource->GetObjectGuid());
}
// some gossips aren't handled in normal way ... so we need to do it this way .. TODO: handle it in normal way ;-)
@ -13094,7 +13094,7 @@ void Player::SendPreparedGossip(WorldObject *pSource)
if (uint32 menuId = PlayerTalkClass->GetGossipMenu().GetMenuId())
textId = GetGossipTextId(menuId);
PlayerTalkClass->SendGossipMenu(textId, pSource->GetGUID());
PlayerTalkClass->SendGossipMenu(textId, pSource->GetObjectGuid());
}
void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 menuId)
@ -13150,7 +13150,7 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me
else if (pMenuData.m_gAction_menu < 0)
{
PlayerTalkClass->CloseGossip();
TalkedToCreature(pSource->GetEntry(), pSource->GetGUID());
TalkedToCreature(pSource->GetEntry(), pSource->GetObjectGuid());
}
if (pMenuData.m_gAction_script)
@ -13165,7 +13165,7 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me
}
case GOSSIP_OPTION_SPIRITHEALER:
if (isDead())
((Creature*)pSource)->CastSpell(((Creature*)pSource),17251,true,NULL,NULL,GetGUID());
((Creature*)pSource)->CastSpell(((Creature*)pSource), 17251, true, NULL, NULL, GetObjectGuid());
break;
case GOSSIP_OPTION_QUESTGIVER:
PrepareQuestMenu(guid);
@ -16994,7 +16994,7 @@ void Player::ConvertInstancesToGroup(Player *player, Group *group, ObjectGuid pl
if (player)
{
player_guid = player->GetGUID();
player_guid = player->GetObjectGuid();
if (!group)
group = player->GetGroup();
}
@ -18681,7 +18681,7 @@ void Player::HandleStealthedUnitsDetection()
{
if(!hasAtClient)
{
ObjectGuid i_guid = (*i)->GetGUID();
ObjectGuid i_guid = (*i)->GetObjectGuid();
(*i)->SendCreateUpdateToPlayer(this);
m_clientGUIDs.insert(i_guid);
@ -18698,7 +18698,7 @@ void Player::HandleStealthedUnitsDetection()
if(hasAtClient)
{
(*i)->DestroyForPlayer(this);
m_clientGUIDs.erase((*i)->GetGUID());
m_clientGUIDs.erase((*i)->GetObjectGuid());
}
}
}
@ -19914,7 +19914,7 @@ template<>
inline void UpdateVisibilityOf_helper(ObjectGuidSet& s64, GameObject* target)
{
if(!target->IsTransport())
s64.insert(target->GetGUID());
s64.insert(target->GetObjectGuid());
}
template<class T>
@ -20208,7 +20208,7 @@ void Player::ApplyEquipCooldown( Item * pItem )
AddSpellCooldown(spellData.SpellId, pItem->GetEntry(), time(NULL) + 30);
WorldPacket data(SMSG_ITEM_COOLDOWN, 12);
data << pItem->GetGUID();
data << ObjectGuid(pItem->GetObjectGuid());
data << uint32(spellData.SpellId);
GetSession()->SendPacket(&data);
}