diff options
Diffstat (limited to 'src/server/game/Garrison/GarrisonMgr.cpp')
| -rw-r--r-- | src/server/game/Garrison/GarrisonMgr.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Garrison/GarrisonMgr.cpp b/src/server/game/Garrison/GarrisonMgr.cpp index 86392a26d36..ba686cf1caf 100644 --- a/src/server/game/Garrison/GarrisonMgr.cpp +++ b/src/server/game/Garrison/GarrisonMgr.cpp @@ -269,21 +269,21 @@ std::list<GarrAbilityEntry const*> GarrisonMgr::RollFollowerAbilities(GarrFollow genericTraits.unique(); std::size_t firstExclusive = 0, total = genericTraits.size(); - for (auto itr = genericTraits.begin(); itr != genericTraits.end(); ++itr, ++firstExclusive) - if ((*itr)->Flags & GARRISON_ABILITY_FLAG_EXCLUSIVE) + for (auto genericTraitItr = genericTraits.begin(); genericTraitItr != genericTraits.end(); ++genericTraitItr, ++firstExclusive) + if ((*genericTraitItr)->Flags & GARRISON_ABILITY_FLAG_EXCLUSIVE) break; while (traitList.size() < size_t(std::max<int32>(0, slots[1] - forcedTraits.size())) && total) { - auto itr = genericTraits.begin(); - std::advance(itr, urand(0, total-- - 1)); - if ((*itr)->Flags & GARRISON_ABILITY_FLAG_EXCLUSIVE) + auto genericTraitItr = genericTraits.begin(); + std::advance(genericTraitItr, urand(0, total-- - 1)); + if ((*genericTraitItr)->Flags & GARRISON_ABILITY_FLAG_EXCLUSIVE) total = firstExclusive; // selected exclusive trait - no other can be selected now else --firstExclusive; - traitList.push_back(*itr); - genericTraits.erase(itr); + traitList.push_back(*genericTraitItr); + genericTraits.erase(genericTraitItr); } } |