From a22e4e121a1e54b2f4154d59623ee4a94a449176 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Jul 2015 00:33:36 +0200 Subject: Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler --- src/server/game/Garrison/Garrison.cpp | 4 ++-- src/server/game/Garrison/GarrisonMgr.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/server/game/Garrison') diff --git a/src/server/game/Garrison/Garrison.cpp b/src/server/game/Garrison/Garrison.cpp index 7040ae65b19..d86252cdfb8 100644 --- a/src/server/game/Garrison/Garrison.cpp +++ b/src/server/game/Garrison/Garrison.cpp @@ -85,7 +85,7 @@ bool Garrison::LoadFromDB(PreparedQueryResult garrison, PreparedQueryResult blue { do { - Field* fields = followers->Fetch(); + fields = followers->Fetch(); uint64 dbId = fields[0].GetUInt64(); uint32 followerId = fields[1].GetUInt32(); @@ -116,7 +116,7 @@ bool Garrison::LoadFromDB(PreparedQueryResult garrison, PreparedQueryResult blue { do { - Field* fields = abilities->Fetch(); + fields = abilities->Fetch(); uint64 dbId = fields[0].GetUInt64(); GarrAbilityEntry const* ability = sGarrAbilityStore.LookupEntry(fields[1].GetUInt32()); 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 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(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); } } -- cgit v1.2.3