diff options
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 325e8c17e1a..1e3c0c0e967 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -602,7 +602,7 @@ bool Group::RemoveMember(ObjectGuid guid, RemoveMethod const& method /*= GROUP_R { data.Initialize(SMSG_GROUP_LIST, 1 + 1 + 1 + 1 + 8 + 4 + 4 + 8); data << uint8(0x10) << uint8(0) << uint8(0) << uint8(0); - data << uint64(m_guid) << uint32(m_counter) << uint32(0) << uint64(0); + data << m_guid << uint32(m_counter) << uint32(0) << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -612,7 +612,7 @@ bool Group::RemoveMember(ObjectGuid guid, RemoveMethod const& method /*= GROUP_R data.Initialize(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); data << uint8(0x10); data << uint32(0); - data << uint64(0); + data << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -859,7 +859,7 @@ void Group::Disband(bool hideDestroy /* = false */) { data.Initialize(SMSG_GROUP_LIST, 1+1+1+1+8+4+4+8); data << uint8(0x10) << uint8(0) << uint8(0) << uint8(0); - data << uint64(m_guid) << uint32(m_counter) << uint32(0) << uint64(0); + data << m_guid << uint32(m_counter) << uint32(0) << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -869,7 +869,7 @@ void Group::Disband(bool hideDestroy /* = false */) data.Initialize(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); data << uint8(0x10); data << uint32(0); - data << uint64(0); + data << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -915,7 +915,7 @@ void Group::Disband(bool hideDestroy /* = false */) void Group::SendLootStartRoll(uint32 countDown, uint32 mapid, Roll const& r) { WorldPacket data(SMSG_LOOT_START_ROLL, (8+4+4+4+4+4+4+1)); - data << uint64(r.itemGUID); // guid of rolled item + data << r.itemGUID; // guid of rolled item data << uint32(mapid); // 3.3.3 mapid data << uint32(r.itemSlot); // itemslot data << uint32(r.itemid); // the itemEntryId for the item that shall be rolled for @@ -942,7 +942,7 @@ void Group::SendLootStartRollToPlayer(uint32 countDown, uint32 mapId, Player* p, return; WorldPacket data(SMSG_LOOT_START_ROLL, (8 + 4 + 4 + 4 + 4 + 4 + 4 + 1)); - data << uint64(r.itemGUID); // guid of rolled item + data << r.itemGUID; // guid of rolled item data << uint32(mapId); // 3.3.3 mapid data << uint32(r.itemSlot); // itemslot data << uint32(r.itemid); // the itemEntryId for the item that shall be rolled for @@ -961,9 +961,9 @@ void Group::SendLootStartRollToPlayer(uint32 countDown, uint32 mapId, Player* p, void Group::SendLootRoll(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 rollNumber, uint8 rollType, Roll const& roll, bool autoPass) { WorldPacket data(SMSG_LOOT_ROLL, (8+4+8+4+4+4+1+1+1)); - data << uint64(sourceGuid); // guid of the item rolled + data << sourceGuid; // guid of the item rolled data << uint32(roll.itemSlot); // slot - data << uint64(targetGuid); + data << targetGuid; data << uint32(roll.itemid); // the itemEntryId for the item that shall be rolled for data << uint32(roll.itemRandomSuffix); // randomSuffix data << uint32(roll.itemRandomPropId); // Item random property ID @@ -985,12 +985,12 @@ void Group::SendLootRoll(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 rol void Group::SendLootRollWon(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 rollNumber, uint8 rollType, Roll const& roll) { WorldPacket data(SMSG_LOOT_ROLL_WON, (8+4+4+4+4+8+1+1)); - data << uint64(sourceGuid); // guid of the item rolled + data << sourceGuid; // guid of the item rolled data << uint32(roll.itemSlot); // slot data << uint32(roll.itemid); // the itemEntryId for the item that shall be rolled for data << uint32(roll.itemRandomSuffix); // randomSuffix data << uint32(roll.itemRandomPropId); // Item random property - data << uint64(targetGuid); // guid of the player who won. + data << targetGuid; // guid of the player who won. data << uint8(rollNumber); // rollnumber realted to SMSG_LOOT_ROLL data << uint8(rollType); // rollType related to SMSG_LOOT_ROLL @@ -1008,7 +1008,7 @@ void Group::SendLootRollWon(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 void Group::SendLootAllPassed(Roll const& roll) { WorldPacket data(SMSG_LOOT_ALL_PASSED, (8+4+4+4+4)); - data << uint64(roll.itemGUID); // Guid of the item rolled + data << roll.itemGUID; // Guid of the item rolled data << uint32(roll.itemSlot); // Item loot slot data << uint32(roll.itemid); // The itemEntryId for the item that shall be rolled for data << uint32(roll.itemRandomPropId); // Item random property ID @@ -1031,7 +1031,7 @@ void Group::SendLooter(Creature* creature, Player* groupLooter) ASSERT(creature); WorldPacket data(SMSG_LOOT_LIST, (8+8)); - data << uint64(creature->GetGUID()); + data << creature->GetGUID(); if (GetLootMethod() == MASTER_LOOT && creature->loot.hasOverThresholdItem()) data << GetMasterLooterGuid().WriteAsPacked(); @@ -1403,7 +1403,7 @@ void Group::MasterLoot(Loot* loot, WorldObject* pLootedObject) if (looter->IsAtGroupRewardDistance(pLootedObject)) { - data << uint64(looter->GetGUID()); + data << looter->GetGUID(); ++real_count; } } @@ -1673,9 +1673,9 @@ void Group::SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid) WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+8+1+8)); data << uint8(0); // set targets - data << uint64(whoGuid); + data << whoGuid; data << uint8(id); - data << uint64(targetGuid); + data << targetGuid; BroadcastPacket(&data, true); } @@ -1693,7 +1693,7 @@ void Group::SendTargetIconList(WorldSession* session) continue; data << uint8(i); - data << uint64(m_targetIcons[i]); + data << m_targetIcons[i]; } session->SendPacket(&data); @@ -1743,7 +1743,7 @@ void Group::SendUpdateToPlayer(Player const* player, MemberSlot const* slot /*= data << uint32(sLFGMgr->GetDungeon(m_guid)); } - data << uint64(m_guid); + data << m_guid; data << uint32(m_counter++); // 3.3, value increases every time this packet gets sent data << uint32(GetMembersCount()-1); for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) @@ -1757,23 +1757,23 @@ void Group::SendUpdateToPlayer(Player const* player, MemberSlot const* slot /*= onlineState = onlineState | ((isBGGroup() || isBFGroup()) ? MEMBER_STATUS_PVP : 0); data << citr->name; - data << uint64(citr->guid); // guid + data << citr->guid; // guid data << uint8(onlineState); // online-state data << uint8(citr->group); // groupid data << uint8(citr->flags); // See enum GroupMemberFlags data << uint8(citr->roles); // Lfg Roles } - data << uint64(m_leaderGuid); // leader guid + data << m_leaderGuid; // leader guid if (GetMembersCount() - 1) { data << uint8(m_lootMethod); // loot method if (m_lootMethod == MASTER_LOOT) - data << uint64(m_masterLooterGuid); // master looter guid + data << m_masterLooterGuid; // master looter guid else - data << uint64(0); + data << ObjectGuid::Empty; data << uint8(m_lootThreshold); // loot threshold data << uint8(m_dungeonDifficulty); // Dungeon Difficulty @@ -1789,7 +1789,7 @@ void Group::SendOriginalGroupUpdateToPlayer(Player const* player) const WorldPacket data(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); data << uint8(m_groupType); data << uint32(GetMembersCount() - 1); - data << uint64(m_leaderGuid); + data << m_leaderGuid; player->SendDirectMessage(&data); } @@ -1842,7 +1842,7 @@ void Group::OfflineReadyCheck() if (!player || !player->GetSession()) { WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9); - data << uint64(citr->guid); + data << citr->guid; data << uint8(0); BroadcastReadyCheck(&data); } |