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/Entities/Object/Object.cpp | 4 ++-- src/server/game/Entities/Object/Object.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Entities/Object') diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 4a819a892b5..fcbab4e8ab4 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2867,8 +2867,8 @@ void WorldObject::UpdateAreaPhase() { bool up = false; uint32 phaseGroup = uint32((*itr)->GetMiscValueB()); - std::set const& phases = sDB2Manager.GetPhasesForGroup(phaseGroup); - for (uint32 phase : phases) + std::set const& phaseIDs = sDB2Manager.GetPhasesForGroup(phaseGroup); + for (uint32 phase : phaseIDs) up = SetInPhase(phase, false, true); if (!updateNeeded && up) updateNeeded = true; diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index ff5ab997385..717410164b2 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -336,7 +336,7 @@ struct MovementInfo bool HasExtraMovementFlag(uint16 flag) const { return (flags2 & flag) != 0; } uint32 GetFallTime() const { return jump.fallTime; } - void SetFallTime(uint32 time) { jump.fallTime = time; } + void SetFallTime(uint32 fallTime) { jump.fallTime = fallTime; } void ResetTransport() { -- cgit v1.2.3