Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-10 20:19:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Improve enum flags with type safe operators

Browse Source
This commit is contained in:
Shauren
2020-04-26 15:27:48 +02:00
parent d994707ba1
commit 0763844fb6
16 changed files with 246 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Phasing/PhasingHandler.cpp
View File

@@ -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<PhaseShiftFlags> flags = PhaseShiftFlags::None;
EnumFlag_t<PhaseShiftFlags> 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>(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>(PhaseShiftFlags::Inverse);
phaseShift.Flags &= PhaseShiftFlags::Inverse;
phaseShift.UpdateUnphasedFlag();
}