diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-04-26 15:27:48 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-04-26 15:27:48 +0200 |
| commit | 0763844fb604075580e1c84672cb2e4a4fe19cde (patch) | |
| tree | f25e720cce02ac894345a77ff87cfa9fce29ad3c /src/server/game/Phasing/PhaseShift.cpp | |
| parent | d994707ba1dba71e65a87b6e3ff8a8630c7cc215 (diff) | |
Core/Misc: Improve enum flags with type safe operators
Diffstat (limited to 'src/server/game/Phasing/PhaseShift.cpp')
| -rw-r--r-- | src/server/game/Phasing/PhaseShift.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Phasing/PhaseShift.cpp b/src/server/game/Phasing/PhaseShift.cpp index d5791b1dbc0..a93101c5687 100644 --- a/src/server/game/Phasing/PhaseShift.cpp +++ b/src/server/game/Phasing/PhaseShift.cpp @@ -89,7 +89,7 @@ void PhaseShift::Clear() void PhaseShift::ClearPhases() { - Flags &= EnumClassFlag<PhaseShiftFlags>(PhaseShiftFlags::AlwaysVisible) | PhaseShiftFlags::Inverse; + Flags &= PhaseShiftFlags::AlwaysVisible | PhaseShiftFlags::Inverse; Phases.clear(); NonCosmeticReferences = 0; CosmeticReferences = 0; @@ -161,7 +161,7 @@ void PhaseShift::ModifyPhasesReferences(PhaseContainer::iterator itr, int32 refe if (CosmeticReferences) Flags |= PhaseShiftFlags::NoCosmetic; else - Flags &= ~EnumClassFlag<PhaseShiftFlags>(PhaseShiftFlags::NoCosmetic); + Flags &= ~PhaseShiftFlags::NoCosmetic; UpdateUnphasedFlag(); } @@ -169,8 +169,8 @@ void PhaseShift::ModifyPhasesReferences(PhaseContainer::iterator itr, int32 refe void PhaseShift::UpdateUnphasedFlag() { - EnumClassFlag<PhaseShiftFlags> unphasedFlag = !Flags.HasFlag(PhaseShiftFlags::Inverse) ? PhaseShiftFlags::Unphased : PhaseShiftFlags::InverseUnphased; - Flags &= ~EnumClassFlag<PhaseShiftFlags>(!Flags.HasFlag(PhaseShiftFlags::Inverse) ? PhaseShiftFlags::InverseUnphased : PhaseShiftFlags::Unphased); + EnumFlag_t<PhaseShiftFlags> unphasedFlag = !Flags.HasFlag(PhaseShiftFlags::Inverse) ? PhaseShiftFlags::Unphased : PhaseShiftFlags::InverseUnphased; + Flags &= ~(!Flags.HasFlag(PhaseShiftFlags::Inverse) ? PhaseShiftFlags::InverseUnphased : PhaseShiftFlags::Unphased); if (NonCosmeticReferences && !DefaultReferences) Flags &= ~unphasedFlag; else |