From 0763844fb604075580e1c84672cb2e4a4fe19cde Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 26 Apr 2020 15:27:48 +0200 Subject: Core/Misc: Improve enum flags with type safe operators --- src/server/game/Phasing/PhasingHandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game/Phasing/PhasingHandler.cpp') diff --git a/src/server/game/Phasing/PhasingHandler.cpp b/src/server/game/Phasing/PhasingHandler.cpp index eb582ca0de9..aefaecc57d7 100644 --- a/src/server/game/Phasing/PhasingHandler.cpp +++ b/src/server/game/Phasing/PhasingHandler.cpp @@ -202,7 +202,7 @@ void PhasingHandler::OnMapChange(WorldObject* object) object->GetPhaseShift().UiMapPhaseIds.clear(); object->GetSuppressedPhaseShift().VisibleMapIds.clear(); - for (auto visibleMapPair : sObjectMgr->GetTerrainSwaps()) + for (auto const& visibleMapPair : sObjectMgr->GetTerrainSwaps()) { for (TerrainSwapInfo const* visibleMapInfo : visibleMapPair.second) { @@ -438,9 +438,9 @@ void PhasingHandler::InitDbPhaseShift(PhaseShift& phaseShift, uint8 phaseUseFlag phaseShift.ClearPhases(); phaseShift.IsDbPhaseShift = true; - EnumClassFlag flags = PhaseShiftFlags::None; + EnumFlag_t flags = PhaseShiftFlags::None; if (phaseUseFlags & PHASE_USE_FLAGS_ALWAYS_VISIBLE) - flags = flags | PhaseShiftFlags::AlwaysVisible | PhaseShiftFlags::Unphased; + flags |= PhaseShiftFlags::AlwaysVisible | PhaseShiftFlags::Unphased; if (phaseUseFlags & PHASE_USE_FLAGS_INVERSE) flags |= PhaseShiftFlags::Inverse; @@ -506,7 +506,7 @@ void PhasingHandler::SetAlwaysVisible(PhaseShift& phaseShift, bool apply) if (apply) phaseShift.Flags |= PhaseShiftFlags::AlwaysVisible; else - phaseShift.Flags &= ~EnumClassFlag(PhaseShiftFlags::AlwaysVisible); + phaseShift.Flags &= ~PhaseShiftFlags::AlwaysVisible; } void PhasingHandler::SetInversed(PhaseShift& phaseShift, bool apply) @@ -514,7 +514,7 @@ void PhasingHandler::SetInversed(PhaseShift& phaseShift, bool apply) if (apply) phaseShift.Flags |= PhaseShiftFlags::Inverse; else - phaseShift.Flags &= ~EnumClassFlag(PhaseShiftFlags::Inverse); + phaseShift.Flags &= PhaseShiftFlags::Inverse; phaseShift.UpdateUnphasedFlag(); } -- cgit v1.2.3