diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-07-21 00:33:36 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-07-21 00:33:36 +0200 |
| commit | a22e4e121a1e54b2f4154d59623ee4a94a449176 (patch) | |
| tree | d4fb01e9f32e3f146062f47638cb1e664568c0de /src/server/game/Entities/Object | |
| parent | 5987391073b0a7a257658ecef51f1df4f0f38842 (diff) | |
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 2 |
2 files changed, 3 insertions, 3 deletions
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<uint32> const& phases = sDB2Manager.GetPhasesForGroup(phaseGroup); - for (uint32 phase : phases) + std::set<uint32> 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() { |