From 678a08c8c5e2de508c7517c91e75e0cd49ea3385 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sat, 4 Jul 2015 02:43:43 +0100 Subject: Core: Fix multiple warnings Travis should be building again now --- src/server/game/Garrison/GarrisonMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Garrison') 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 GarrisonMgr::RollFollowerAbilities(GarrFollow bool hasForcedExclusiveTrait = false; std::list 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 GarrisonMgr::RollFollowerAbilities(GarrFollow if ((*itr)->Flags & GARRISON_ABILITY_FLAG_EXCLUSIVE) break; - while (traitList.size() < std::max(0, slots[1] - forcedTraits.size()) && total) + while (traitList.size() < size_t(std::max(0, slots[1] - forcedTraits.size())) && total) { auto itr = genericTraits.begin(); std::advance(itr, urand(0, total-- - 1)); -- cgit v1.2.3