josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64

Browse Source
This commit is contained in:
Shauren
2014-10-21 21:09:15 +02:00
parent 034561792c
commit 68f45e8734
21 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Object.cpp
+5 -5
View File
@@ -273,14 +273,14 @@ void Object::DestroyForPlayer(Player* target, bool onDeath) const
if (bg->isArena())
{
WorldPacket data(SMSG_ARENA_UNIT_DESTROYED, 8);
data << uint64(GetGUID());
data << GetGUID();
target->GetSession()->SendPacket(&data);
}
}
}
WorldPacket data(SMSG_DESTROY_OBJECT, 8 + 1);
data << uint64(GetGUID());
data << GetGUID();
//! If the following bool is true, the client will call "void CGUnit_C::OnDeath()" for this object.
//! OnDeath() does for eg trigger death animation and interrupts certain spells/missiles/auras/sounds...
data << uint8(onDeath ? 1 : 0);
@@ -2087,7 +2087,7 @@ void WorldObject::SendMessageToSet(WorldPacket* data, Player const* skipped_rcvr
void WorldObject::SendObjectDeSpawnAnim(ObjectGuid guid)
{
WorldPacket data(SMSG_GAMEOBJECT_DESPAWN_ANIM, 8);
data << uint64(guid);
data << guid;
SendMessageToSet(&data, true);
}
@@ -2760,7 +2760,7 @@ void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/)
{
WorldPacket data(SMSG_PLAY_OBJECT_SOUND, 4 + 8);
data << uint32(sound_id);
data << uint64(GetGUID());
data << GetGUID();
if (target)
target->SendDirectMessage(&data);
else
@@ -2771,7 +2771,7 @@ void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/)
{
WorldPacket data(SMSG_PLAY_SOUND, 4 + 8);
data << uint32(sound_id);
data << uint64(GetGUID());
data << GetGUID();
if (target)
target->SendDirectMessage(&data);
else