diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-02-10 12:25:27 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-10 12:25:27 +0100 |
| commit | 68a662ae04ce5fd6378793925f955e23fff99a6b (patch) | |
| tree | c22fc4ab4cadabf3c65d3a62df72350e54a300c0 /src/server/game/Spells/Spell.cpp | |
| parent | f4cf0ecad6fd8a908e7140cdad82d5d5fdce3753 (diff) | |
Core/Spells: Add type safety to proc related functions - using enum arguments instead of plain integers
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 5ac413809f6..54323f5fdcf 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -585,7 +585,7 @@ m_spellValue(new SpellValue(m_spellInfo, caster)), _spellEvent(nullptr) effectInfo = nullptr; m_damage = 0; m_healing = 0; - m_hitMask = 0; + m_hitMask = PROC_HIT_NONE; focusObject = nullptr; m_castId = ObjectGuid::Create<HighGuid::Cast>(SPELL_CAST_SOURCE_NORMAL, m_caster->GetMapId(), m_spellInfo->Id, m_caster->GetMap()->GenerateLowGuid<HighGuid::Cast>()); m_originalCastId = originalCastId; @@ -2225,9 +2225,9 @@ class ProcReflectDelayed : public BasicEvent ProcFlags const typeMaskActor = PROC_FLAG_NONE; ProcFlags const typeMaskActionTarget = PROC_FLAG_TAKEN_SPELL_MAGIC_DMG_CLASS_NEG | PROC_FLAG_TAKEN_SPELL_NONE_DMG_CLASS_NEG; - uint32 const spellTypeMask = PROC_SPELL_TYPE_DAMAGE | PROC_SPELL_TYPE_NO_DMG_HEAL; - uint32 const spellPhaseMask = PROC_SPELL_PHASE_NONE; - uint32 const hitMask = PROC_HIT_REFLECT; + ProcFlagsSpellType const spellTypeMask = PROC_SPELL_TYPE_DAMAGE | PROC_SPELL_TYPE_NO_DMG_HEAL; + ProcFlagsSpellPhase const spellPhaseMask = PROC_SPELL_PHASE_NONE; + ProcFlagsHit const hitMask = PROC_HIT_REFLECT; Unit::ProcSkillsAndAuras(caster, _victim, typeMaskActor, typeMaskActionTarget, spellTypeMask, spellPhaseMask, hitMask, nullptr, nullptr, nullptr); return true; @@ -2597,8 +2597,8 @@ void Spell::TargetInfo::DoDamageAndTriggers(Spell* spell) // Fill base trigger info ProcFlagsInit procAttacker = spell->m_procAttacker; ProcFlagsInit procVictim = spell->m_procVictim; - uint32 procSpellType = PROC_SPELL_TYPE_NONE; - uint32 hitMask = PROC_HIT_NONE; + ProcFlagsSpellType procSpellType = PROC_SPELL_TYPE_NONE; + ProcFlagsHit hitMask = PROC_HIT_NONE; // Spells with this flag cannot trigger if effect is cast on self bool const canEffectTrigger = !spell->m_spellInfo->HasAttribute(SPELL_ATTR3_CANT_TRIGGER_PROC) && spell->unitTarget->CanProc() && @@ -3697,7 +3697,7 @@ void Spell::_cast(bool skipCheck) procAttacker = IsPositive() ? PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_POS : PROC_FLAG_DONE_SPELL_NONE_DMG_CLASS_NEG; } - uint32 hitMask = m_hitMask; + ProcFlagsHit hitMask = m_hitMask; if (!(hitMask & PROC_HIT_CRITICAL)) hitMask |= PROC_HIT_NORMAL; |