diff options
author | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 02:43:43 +0100 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 02:43:43 +0100 |
commit | 678a08c8c5e2de508c7517c91e75e0cd49ea3385 (patch) | |
tree | 9be675a4d19d11df66b5d1abf1653e7a263d530b /src/server/game/Garrison | |
parent | 0f082e8f925f17e585fd221b901f55581d2d68ab (diff) |
Core: Fix multiple warnings
Travis should be building again now
Diffstat (limited to 'src/server/game/Garrison')
-rw-r--r-- | src/server/game/Garrison/GarrisonMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Garrison/GarrisonMgr.cpp b/src/server/game/Garrison/GarrisonMgr.cpp index a27574f4df4..349ebdc42a1 100644 --- a/src/server/game/Garrison/GarrisonMgr.cpp +++ b/src/server/game/Garrison/GarrisonMgr.cpp @@ -161,7 +161,7 @@ std::list<GarrAbilityEntry const*> GarrisonMgr::RollFollowerAbilities(GarrFollow bool hasForcedExclusiveTrait = false; std::list<GarrAbilityEntry const*> result; - int32 slots[2] = { AbilitiesForQuality[quality][0], AbilitiesForQuality[quality][1] }; + uint32 slots[2] = { AbilitiesForQuality[quality][0], AbilitiesForQuality[quality][1] }; GarrAbilities const* abilities = nullptr; auto itr = _garrisonFollowerAbilities[faction].find(follower->ID); @@ -270,7 +270,7 @@ std::list<GarrAbilityEntry const*> GarrisonMgr::RollFollowerAbilities(GarrFollow if ((*itr)->Flags & GARRISON_ABILITY_FLAG_EXCLUSIVE) break; - while (traitList.size() < std::max<int32>(0, slots[1] - forcedTraits.size()) && total) + 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)); |