diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 21:09:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 21:09:15 +0200 |
| commit | 68f45e87345ff85341f835f0372f2a62b89f24d9 (patch) | |
| tree | e57ec0d466a20391e9f14b59625317294fe6a134 /src/server/game/Entities/Object | |
| parent | 034561792ca9a07d719961ea842af2118428816f (diff) | |
Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 4248924b40b..f3681ac85e6 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -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 |