diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-08-06 20:21:34 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-08-07 00:05:36 +0200 |
| commit | 98007f859b7318570c0c923a00aa32fc485c8ec8 (patch) | |
| tree | ef8405fa2d3740b6531a510673a0124dd0c2c957 /src/server/game/Conditions | |
| parent | d2784d4c65ec987fe587718d96b2feb885905e13 (diff) | |
Core/Misc: Turn ChrSpecialization into enum class
Diffstat (limited to 'src/server/game/Conditions')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index a8f2deffa28..7e35dd31e03 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -3000,7 +3000,7 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio if (condition->ChrSpecializationIndex >= 0 || condition->ChrSpecializationRole >= 0) { - if (ChrSpecializationEntry const* spec = sChrSpecializationStore.LookupEntry(player->GetPrimarySpecialization())) + if (ChrSpecializationEntry const* spec = sChrSpecializationStore.LookupEntry(AsUnderlyingType(player->GetPrimarySpecialization()))) { if (condition->ChrSpecializationIndex >= 0 && spec->OrderIndex != condition->ChrSpecializationIndex) return false; @@ -4016,17 +4016,17 @@ int32 GetUnitConditionVariable(Unit const* unit, Unit const* otherUnit, UnitCond case UnitConditionVariable::IsEnemy: return otherUnit && unit->GetReactionTo(otherUnit) <= REP_HOSTILE; case UnitConditionVariable::IsSpecMelee: - return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetFlags().HasFlag(ChrSpecializationFlag::Melee); + return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecializationEntry() + && unit->ToPlayer()->GetPrimarySpecializationEntry()->GetFlags().HasFlag(ChrSpecializationFlag::Melee); case UnitConditionVariable::IsSpecTank: - return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetRole() == ChrSpecializationRole::Tank; + return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecializationEntry() + && unit->ToPlayer()->GetPrimarySpecializationEntry()->GetRole() == ChrSpecializationRole::Tank; case UnitConditionVariable::IsSpecRanged: - return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetFlags().HasFlag(ChrSpecializationFlag::Ranged); + return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecializationEntry() + && unit->ToPlayer()->GetPrimarySpecializationEntry()->GetFlags().HasFlag(ChrSpecializationFlag::Ranged); case UnitConditionVariable::IsSpecHealer: - return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecialization() - && sChrSpecializationStore.AssertEntry(unit->ToPlayer()->GetPrimarySpecialization())->GetRole() == ChrSpecializationRole::Healer; + return unit->IsPlayer() && unit->ToPlayer()->GetPrimarySpecializationEntry() + && unit->ToPlayer()->GetPrimarySpecializationEntry()->GetRole() == ChrSpecializationRole::Healer; case UnitConditionVariable::IsPlayerControlledNPC: return unit->IsCreature() && unit->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED); case UnitConditionVariable::IsDying: |