diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
| commit | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (patch) | |
| tree | e40c2f50a9b5b11620ee607103f0352521bdf54f /src/server/game/DungeonFinding | |
| parent | 1bea52fd4649b6a1761aa157f9e74f01e19872e7 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/game/DungeonFinding')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/DungeonFinding/LFGQueue.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 3946d7b543f..fa5bf55df38 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -665,7 +665,7 @@ void LFGMgr::UpdateRoleCheck(ObjectGuid gguid, ObjectGuid guid /* = ObjectGuid:: return; LfgRoleCheck& roleCheck = itRoleCheck->second; - bool sendRoleChosen = roleCheck.state != LFG_ROLECHECK_DEFAULT && guid; + bool sendRoleChosen = roleCheck.state != LFG_ROLECHECK_DEFAULT && !guid.IsEmpty(); if (!guid) roleCheck.state = LFG_ROLECHECK_ABORTED; @@ -862,7 +862,7 @@ void LFGMgr::MakeNewGroup(LfgProposal const& proposal) LFGDungeonData const* dungeon = GetLFGDungeon(proposal.dungeonId); ASSERT(dungeon); - Group* grp = proposal.group ? sGroupMgr->GetGroupByGUID(proposal.group.GetCounter()) : NULL; + Group* grp = !proposal.group.IsEmpty() ? sGroupMgr->GetGroupByGUID(proposal.group.GetCounter()) : NULL; for (GuidList::const_iterator it = players.begin(); it != players.end(); ++it) { ObjectGuid pguid = (*it); @@ -1046,7 +1046,7 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate if (it->second.accept == LFG_ANSWER_AGREE) continue; - ObjectGuid guid = it->second.group ? it->second.group : it->first; + ObjectGuid guid = !it->second.group.IsEmpty() ? it->second.group : it->first; // Player didn't accept or still pending when no secs left if (it->second.accept == LFG_ANSWER_DENY || type == LFG_UPDATETYPE_PROPOSAL_FAILED) { @@ -1059,7 +1059,7 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate for (LfgProposalPlayerContainer::const_iterator it = proposal.players.begin(); it != proposal.players.end(); ++it) { ObjectGuid guid = it->first; - ObjectGuid gguid = it->second.group ? it->second.group : guid; + ObjectGuid gguid = !it->second.group.IsEmpty() ? it->second.group : guid; SendLfgUpdateProposal(guid, proposal); @@ -1822,7 +1822,7 @@ void LFGMgr::SendLfgQueueStatus(ObjectGuid guid, LfgQueueStatusData const& data) bool LFGMgr::IsLfgGroup(ObjectGuid guid) { - return guid && guid.IsGroup() && GroupsStore[guid].IsLfgGroup(); + return !guid.IsEmpty() && guid.IsGroup() && GroupsStore[guid].IsLfgGroup(); } uint8 LFGMgr::GetQueueId(ObjectGuid guid) diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index df08b55a856..c5ec92ba29a 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -520,7 +520,7 @@ LfgCompatibility LFGQueue::CheckCompatibility(GuidList check) LfgProposalPlayer &data = proposal.players[itRoles->first]; data.role = itRoles->second; data.group = proposalGroups.find(itRoles->first)->second; - if (!proposal.isNew && data.group && data.group == proposal.group) // Player from existing group, autoaccept + if (!proposal.isNew && !data.group.IsEmpty() && data.group == proposal.group) // Player from existing group, autoaccept data.accept = LFG_ANSWER_AGREE; } |