diff options
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 3bc60f66b3c..de2957d25b2 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -528,7 +528,7 @@ m_spellValue(new SpellValue(m_spellInfo, caster)), _spellEvent(nullptr) { // wand case if (m_attackType == RANGED_ATTACK) - if ((playerCaster->getClassMask() & CLASSMASK_WAND_USERS) != 0) + if ((playerCaster->GetClassMask() & CLASSMASK_WAND_USERS) != 0) if (Item* pItem = playerCaster->GetWeaponForAttack(RANGED_ATTACK)) m_spellSchoolMask = SpellSchoolMask(1 << pItem->GetTemplate()->GetDamageType()); } @@ -4392,7 +4392,7 @@ void Spell::SendSpellGo() castFlags |= CAST_FLAG_POWER_LEFT_SELF; if ((m_caster->GetTypeId() == TYPEID_PLAYER) - && (m_caster->ToPlayer()->getClass() == CLASS_DEATH_KNIGHT) + && (m_caster->ToPlayer()->GetClass() == CLASS_DEATH_KNIGHT) && HasPowerTypeCost(POWER_RUNES) && !(_triggeredCastFlags & TRIGGERED_IGNORE_POWER_AND_REAGENT_COST)) { @@ -4957,7 +4957,7 @@ SpellCastResult Spell::CheckRuneCost() const if (!player) return SPELL_CAST_OK; - if (player->getClass() != CLASS_DEATH_KNIGHT) + if (player->GetClass() != CLASS_DEATH_KNIGHT) return SPELL_CAST_OK; int32 readyRunes = 0; @@ -4973,7 +4973,7 @@ SpellCastResult Spell::CheckRuneCost() const void Spell::TakeRunePower(bool didHit) { - if (m_caster->GetTypeId() != TYPEID_PLAYER || m_caster->ToPlayer()->getClass() != CLASS_DEATH_KNIGHT) + if (m_caster->GetTypeId() != TYPEID_PLAYER || m_caster->ToPlayer()->GetClass() != CLASS_DEATH_KNIGHT) return; Player* player = m_caster->ToPlayer(); @@ -5156,12 +5156,12 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 && !m_spellInfo->HasAttribute(SPELL_ATTR0_REQ_AMMO) && !m_spellInfo->HasEffect(SPELL_EFFECT_ATTACK) && !m_spellInfo->HasAttribute(SPELL_ATTR12_IGNORE_CASTING_DISABLED) - && !playerCaster->HasAuraTypeWithFamilyFlags(SPELL_AURA_DISABLE_CASTING_EXCEPT_ABILITIES, sChrClassesStore.AssertEntry(playerCaster->getClass())->SpellClassSet, m_spellInfo->SpellFamilyFlags)) + && !playerCaster->HasAuraTypeWithFamilyFlags(SPELL_AURA_DISABLE_CASTING_EXCEPT_ABILITIES, sChrClassesStore.AssertEntry(playerCaster->GetClass())->SpellClassSet, m_spellInfo->SpellFamilyFlags)) return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; if (playerCaster->HasAuraType(SPELL_AURA_DISABLE_ATTACKING_EXCEPT_ABILITIES)) { - if (!playerCaster->HasAuraTypeWithFamilyFlags(SPELL_AURA_DISABLE_ATTACKING_EXCEPT_ABILITIES, sChrClassesStore.AssertEntry(playerCaster->getClass())->SpellClassSet, m_spellInfo->SpellFamilyFlags)) + if (!playerCaster->HasAuraTypeWithFamilyFlags(SPELL_AURA_DISABLE_ATTACKING_EXCEPT_ABILITIES, sChrClassesStore.AssertEntry(playerCaster->GetClass())->SpellClassSet, m_spellInfo->SpellFamilyFlags)) { if (m_spellInfo->HasAttribute(SPELL_ATTR0_REQ_AMMO) || m_spellInfo->IsNextMeleeSwingSpell() @@ -5534,7 +5534,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 if (!learn_spellproto) return SPELL_FAILED_NOT_KNOWN; - if (m_spellInfo->SpellLevel > pet->getLevel()) + if (m_spellInfo->SpellLevel > pet->GetLevel()) return SPELL_FAILED_LOWLEVEL; break; @@ -5565,7 +5565,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 if (!learn_spellproto) return SPELL_FAILED_NOT_KNOWN; - if (m_spellInfo->SpellLevel > pet->getLevel()) + if (m_spellInfo->SpellLevel > pet->GetLevel()) return SPELL_FAILED_LOWLEVEL; } break; @@ -5644,7 +5644,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 if (!pet->HaveInDiet(foodItem->GetTemplate())) return SPELL_FAILED_WRONG_PET_FOOD; - if (foodItem->GetTemplate()->GetBaseItemLevel() + 30 <= pet->getLevel()) + if (foodItem->GetTemplate()->GetBaseItemLevel() + 30 <= pet->GetLevel()) return SPELL_FAILED_FOOD_LOWLEVEL; if (m_caster->ToPlayer()->IsInCombat() || pet->IsInCombat()) @@ -5943,7 +5943,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 if (!player) return SPELL_FAILED_TARGET_NOT_PLAYER; - if (!spec || (spec->ClassID != player->getClass() && !spec->IsPetSpecialization())) + if (!spec || (spec->ClassID != player->GetClass() && !spec->IsPetSpecialization())) return SPELL_FAILED_NO_SPEC; if (spec->IsPetSpecialization()) @@ -7794,7 +7794,7 @@ SpellCastResult Spell::CanOpenLock(SpellEffectInfo const& effect, uint32 lockId, if (!m_CastItem && unitCaster->GetTypeId() == TYPEID_PLAYER) skillValue = unitCaster->ToPlayer()->GetSkillValue(skillId); else if (lockInfo->Index[j] == LOCKTYPE_LOCKPICKING) - skillValue = unitCaster->getLevel() * 5; + skillValue = unitCaster->GetLevel() * 5; // skill bonus provided by casting spell (mostly item spells) // add the effect base points modifier from the spell cast (cheat lock / skeleton key etc.) @@ -8308,7 +8308,7 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target) const case TARGET_CHECK_RAID_CLASS: if (!refUnit) return false; - if (refUnit->getClass() != unitTarget->getClass()) + if (refUnit->GetClass() != unitTarget->GetClass()) return false; /* fallthrough */ case TARGET_CHECK_RAID: |