mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +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

16
src/game/GameObject.cpp
View file

@ -199,7 +199,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
udata.BuildPacket(&packet);
((Player*)caster)->GetSession()->SendPacket(&packet);
SendGameObjectCustomAnim(GetGUID());
SendGameObjectCustomAnim(GetObjectGuid());
}
m_lootState = GO_READY; // can be successfully open with some chance
@ -316,7 +316,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
{
Unit *caster = owner ? owner : ok;
caster->CastSpell(ok, goInfo->trap.spellId, true, NULL, NULL, GetGUID());
caster->CastSpell(ok, goInfo->trap.spellId, true, NULL, NULL, GetObjectGuid());
// use template cooldown if provided
m_cooldownTime = time(NULL) + (goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4));
@ -329,7 +329,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
//BattleGround gameobjects case
if (((Player*)ok)->InBattleGround())
if (BattleGround *bg = ((Player*)ok)->GetBattleGround())
bg->HandleTriggerBuff(GetGUID());
bg->HandleTriggerBuff(GetObjectGuid());
}
}
}
@ -380,7 +380,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
for (GuidsSet::const_iterator itr = m_UniqueUsers.begin(); itr != m_UniqueUsers.end(); ++itr)
{
if (Player* owner = GetMap()->GetPlayer(*itr))
owner->CastSpell(owner, spellId, false, NULL, NULL, GetGUID());
owner->CastSpell(owner, spellId, false, NULL, NULL, GetObjectGuid());
}
ClearAllUsesData();
@ -404,7 +404,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/)
// burning flags in some battlegrounds, if you find better condition, just add it
if (GetGOInfo()->IsDespawnAtAction() || GetGoAnimProgress() > 0)
{
SendObjectDeSpawnAnim(GetGUID());
SendObjectDeSpawnAnim(GetObjectGuid());
//reset flags
SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
}
@ -458,7 +458,7 @@ void GameObject::AddUniqueUse(Player* player)
void GameObject::Delete()
{
SendObjectDeSpawnAnim(GetGUID());
SendObjectDeSpawnAnim(GetObjectGuid());
SetGoState(GO_STATE_READY);
SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
@ -1098,7 +1098,7 @@ void GameObject::Use(Unit* user)
if (info->goober.pageId) // show page...
{
WorldPacket data(SMSG_GAMEOBJECT_PAGETEXT, 8);
data << GetGUID();
data << ObjectGuid(GetObjectGuid());
player->GetSession()->SendPacket(&data);
}
else if (info->goober.gossipID) // ...or gossip, if page does not exist
@ -1139,7 +1139,7 @@ void GameObject::Use(Unit* user)
// this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389)
if (time_to_restore && info->goober.customAnim)
SendGameObjectCustomAnim(GetGUID());
SendGameObjectCustomAnim(GetObjectGuid());
else
SetGoState(GO_STATE_ACTIVE);