diff options
author | Shauren <shauren.trinity@gmail.com> | 2023-08-06 21:40:10 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2023-08-07 00:05:36 +0200 |
commit | 054723241eaf1abe7d45a96460e84b9ff113ffb2 (patch) | |
tree | ca21c9a69def2af64e68d66106a73f5c5553e262 /src/server/game/Conditions | |
parent | e71b2f62c1eac13d90840970b64a37b7cc40e915 (diff) |
Core/Misc: Reduce number of player spec hardcoded checks
Diffstat (limited to 'src/server/game/Conditions')
-rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index cdcb7e18527..a8f2deffa28 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -4017,16 +4017,16 @@ int32 GetUnitConditionVariable(Unit const* unit, Unit const* otherUnit, UnitCond return otherUnit && unit->GetReactionTo(otherUnit) <= REP_HOSTILE; case UnitConditionVariable::IsSpecMelee: return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->Flags & CHR_SPECIALIZATION_FLAG_MELEE; + && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetFlags().HasFlag(ChrSpecializationFlag::Melee); case UnitConditionVariable::IsSpecTank: return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->Role == 0; + && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetRole() == ChrSpecializationRole::Tank; case UnitConditionVariable::IsSpecRanged: return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->Flags & CHR_SPECIALIZATION_FLAG_RANGED; + && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetFlags().HasFlag(ChrSpecializationFlag::Ranged); case UnitConditionVariable::IsSpecHealer: return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->Role == 1; + && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetRole() == ChrSpecializationRole::Healer; case UnitConditionVariable::IsPlayerControlledNPC: return unit->IsCreature() && unit->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); case UnitConditionVariable::IsDying: |