diff options
Diffstat (limited to 'src/server/game/Achievements/CriteriaHandler.cpp')
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index 708afe85b69..5e1ed43ab1e 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -2149,8 +2149,8 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 { uint32 guildMemberCount = 0; if (Group const* group = referencePlayer->GetGroup()) - for (GroupReference const* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) - if (itr->GetSource()->GetGuildId() == referencePlayer->GetGuildId()) + for (GroupReference const& itr : group->GetMembers()) + if (itr.GetSource()->GetGuildId() == referencePlayer->GetGuildId()) ++guildMemberCount; if (guildMemberCount < reqValue) @@ -3088,8 +3088,8 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 { uint32 memberCount = 0; if (Group const* group = referencePlayer->GetGroup()) - for (GroupReference const* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) - if (itr->GetSource() != referencePlayer && *referencePlayer->m_playerData->VirtualPlayerRealm == *itr->GetSource()->m_playerData->VirtualPlayerRealm) + for (GroupReference const& itr : group->GetMembers()) + if (itr.GetSource() != referencePlayer && *referencePlayer->m_playerData->VirtualPlayerRealm == *itr.GetSource()->m_playerData->VirtualPlayerRealm) ++memberCount; if (memberCount < reqValue) return false; @@ -3188,8 +3188,8 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 if (Group const* group = referencePlayer->GetGroup()) { uint32 membersWithAchievement = 0; - for (GroupReference const* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) - if (itr->GetSource()->HasAchieved(secondaryAsset)) + for (GroupReference const& itr : group->GetMembers()) + if (itr.GetSource()->HasAchieved(secondaryAsset)) ++membersWithAchievement; if (membersWithAchievement > reqValue) @@ -3551,8 +3551,8 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 Group const* group = referencePlayer->GetGroup(); if (!group) return false; - for (GroupReference const* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) - if (itr->GetSource()->GetSession()->GetRecruiterId() == referencePlayer->GetSession()->GetAccountId()) + for (GroupReference const& itr : group->GetMembers()) + if (itr.GetSource()->GetSession()->GetRecruiterId() == referencePlayer->GetSession()->GetAccountId()) return true; return false; } @@ -3561,8 +3561,8 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 Group const* group = referencePlayer->GetGroup(); if (!group) return false; - for (GroupReference const* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) - if (itr->GetSource()->GetSession()->GetAccountId() == referencePlayer->GetSession()->GetRecruiterId()) + for (GroupReference const& itr : group->GetMembers()) + if (itr.GetSource()->GetSession()->GetAccountId() == referencePlayer->GetSession()->GetRecruiterId()) return true; return false; } @@ -3693,8 +3693,8 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 { if (Group const* group = referencePlayer->GetGroup()) { - for (GroupReference const* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) - if (!itr->GetSource()->HasAchieved(reqValue)) + for (GroupReference const& itr : group->GetMembers()) + if (!itr.GetSource()->HasAchieved(reqValue)) return false; } else if (!referencePlayer->HasAchieved(reqValue)) |