diff options
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index e7439700fc1..f9edb30ec30 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -548,7 +548,7 @@ m_caster((info->HasAttribute(SPELL_ATTR6_CAST_BY_CHARMER) && caster->GetCharmerO { // 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()->Damage[0].DamageType); } @@ -2101,7 +2101,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*= if (m_auraScaleMask && ihit->EffectMask == m_auraScaleMask && m_caster != target) { SpellInfo const* auraSpell = m_spellInfo->GetFirstRankSpell(); - if (uint32(target->getLevel() + 10) >= auraSpell->SpellLevel) + if (uint32(target->GetLevel() + 10) >= auraSpell->SpellLevel) ihit->ScaleAura = true; } return; @@ -2121,7 +2121,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*= if (m_auraScaleMask && targetInfo.EffectMask == m_auraScaleMask && m_caster != target) { SpellInfo const* auraSpell = m_spellInfo->GetFirstRankSpell(); - if (uint32(target->getLevel() + 10) >= auraSpell->SpellLevel) + if (uint32(target->GetLevel() + 10) >= auraSpell->SpellLevel) targetInfo.ScaleAura = true; } @@ -2699,7 +2699,7 @@ SpellMissInfo Spell::PreprocessSpellHit(Unit* unit, bool scaleAura, TargetInfo& hitInfo.AuraSpellInfo = m_spellInfo; if (scaleAura) { - if (SpellInfo const* actualSpellInfo = m_spellInfo->GetAuraRankForLevel(unitTarget->getLevel())) + if (SpellInfo const* actualSpellInfo = m_spellInfo->GetAuraRankForLevel(unitTarget->GetLevel())) hitInfo.AuraSpellInfo = actualSpellInfo; for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) @@ -4168,7 +4168,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) && m_spellInfo->RuneCostID && m_spellInfo->PowerType == POWER_RUNE && !(_triggeredCastFlags & TRIGGERED_IGNORE_POWER_AND_REAGENT_COST)) @@ -4753,7 +4753,7 @@ SpellCastResult Spell::CheckRuneCost(uint32 runeCostID) const if (!player) return SPELL_CAST_OK; - if (player->getClass() != CLASS_DEATH_KNIGHT) + if (player->GetClass() != CLASS_DEATH_KNIGHT) return SPELL_CAST_OK; SpellRuneCostEntry const* src = sSpellRuneCostStore.LookupEntry(runeCostID); @@ -4793,7 +4793,7 @@ SpellCastResult Spell::CheckRuneCost(uint32 runeCostID) 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; SpellRuneCostEntry const* runeCostData = sSpellRuneCostStore.LookupEntry(m_spellInfo->RuneCostID); @@ -5401,7 +5401,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint 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; @@ -5423,7 +5423,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint 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; @@ -5541,7 +5541,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint uint32 skill = creature->GetCreatureTemplate()->GetRequiredLootSkill(); int32 skillValue = m_caster->ToPlayer()->GetSkillValue(skill); - int32 TargetLevel = m_targets.GetUnitTarget()->getLevel(); + int32 TargetLevel = m_targets.GetUnitTarget()->GetLevel(); int32 ReqValue = (skillValue < 100 ? (TargetLevel-10) * 10 : TargetLevel * 5); if (ReqValue > skillValue) return SPELL_FAILED_LOW_CASTLEVEL; @@ -5861,7 +5861,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint return SPELL_FAILED_TARGET_IS_PLAYER_CONTROLLED; int32 value = CalculateDamage(i); - if (value && int32(target->getLevel()) > value) + if (value && int32(target->GetLevel()) > value) return SPELL_FAILED_HIGHLEVEL; } @@ -7162,7 +7162,7 @@ bool Spell::CheckEffectTarget(Unit const* target, uint32 eff, Position const* lo if (target->GetCharmerGUID()) return false; if (int32 value = CalculateDamage(eff)) - if ((int32)target->getLevel() > value) + if ((int32)target->GetLevel() > value) return false; break; default: @@ -8115,7 +8115,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: |