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/Handlers/GroupHandler.cpp | |
| parent | 034561792ca9a07d719961ea842af2118428816f (diff) | |
Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/game/Handlers/GroupHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/GroupHandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 5889339d6e9..dca9465b3d3 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -694,7 +694,7 @@ void WorldSession::HandleMinimapPingOpcode(WorldPacket& recvData) // everything's fine, do it WorldPacket data(MSG_MINIMAP_PING, (8+4+4)); - data << uint64(GetPlayer()->GetGUID()); + data << GetPlayer()->GetGUID(); data << float(x); data << float(y); GetPlayer()->GetGroup()->BroadcastPacket(&data, true, -1, GetPlayer()->GetGUID()); @@ -722,7 +722,7 @@ void WorldSession::HandleRandomRollOpcode(WorldPacket& recvData) data << uint32(minimum); data << uint32(maximum); data << uint32(roll); - data << uint64(GetPlayer()->GetGUID()); + data << GetPlayer()->GetGUID(); if (GetPlayer()->GetGroup()) GetPlayer()->GetGroup()->BroadcastPacket(&data, false); else @@ -804,7 +804,7 @@ void WorldSession::HandleGroupRequestJoinUpdates(WorldPacket& /*recvData*/) WorldPacket data(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); data << uint8(group->GetGroupType()); data << uint32(group->GetMembersCount() - 1); - data << uint64(group->GetLeaderGUID()); + data << group->GetLeaderGUID(); SendPacket(&data); } @@ -938,7 +938,7 @@ void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData) // everything's fine, do it WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9); - data << uint64(GetPlayer()->GetGUID()); + data << GetPlayer()->GetGUID(); data << uint8(state); group->BroadcastReadyCheck(&data); } @@ -1072,9 +1072,9 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke if (mask & GROUP_UPDATE_FLAG_PET_GUID) { if (pet) - *data << uint64(pet->GetGUID()); + *data << pet->GetGUID(); else - *data << uint64(0); + *data << ObjectGuid::Empty; } if (mask & GROUP_UPDATE_FLAG_PET_NAME) @@ -1307,7 +1307,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData) data.put<uint64>(maskPos, auramask); // GROUP_UPDATE_FLAG_AURAS if (updateFlags & GROUP_UPDATE_FLAG_PET_GUID) - data << uint64(pet->GetGUID()); + data << pet->GetGUID(); data << std::string(pet ? pet->GetName() : ""); // GROUP_UPDATE_FLAG_PET_NAME data << uint16(pet ? pet->GetDisplayId() : 0); // GROUP_UPDATE_FLAG_PET_MODEL_ID |