aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2019-07-01 21:36:32 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-13 00:42:20 +0100
commit4e6c59dca78ce563c327ea3106d0ff6786b1e127 (patch)
tree11baa861d6e0eda35d4d73feba91a79c1bae788d /src/server/game/Spells
parentb8d675eba761a5616c7d69a78851ea61af61f4f6 (diff)
Core/Unit: rename several getters to follow codestyle
uint8 GetLevel() uint8 GetLevelForTarget(WorldObject const* /*target*/) void SetLevel(uint8 lvl) uint8 GetRace() uint32 GetRaceMask() uint8 GetClass() uint32 GetClassMask() uint8 GetGender() (cherry picked from commit 5c09ff51f7015b775def8d5cc1f678eaef37200f)
Diffstat (limited to 'src/server/game/Spells')
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp64
-rw-r--r--src/server/game/Spells/Auras/SpellAuras.cpp6
-rw-r--r--src/server/game/Spells/Spell.cpp24
-rw-r--r--src/server/game/Spells/SpellEffects.cpp18
-rw-r--r--src/server/game/Spells/SpellInfo.cpp16
-rw-r--r--src/server/game/Spells/SpellMgr.cpp4
6 files changed, 66 insertions, 66 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index bc7d4907586..e41713cba15 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1751,7 +1751,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo
if (!target->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
{
target->SetShapeshiftForm(FORM_NONE);
- if (target->getClass() == CLASS_DRUID)
+ if (target->GetClass() == CLASS_DRUID)
{
// Remove movement impairing effects also when shifting out
target->RemoveAurasByShapeShift();
@@ -1790,7 +1790,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo
else
target->UpdateDisplayPower();
- if (target->getClass() == CLASS_DRUID)
+ if (target->GetClass() == CLASS_DRUID)
{
// Dash
if (AuraEffect* aurEff = target->GetAuraEffect(SPELL_AURA_MOD_INCREASE_SPEED, SPELLFAMILY_DRUID, flag128(0, 0, 0x8)))
@@ -1850,47 +1850,47 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode,
if (target->GetTypeId() != TYPEID_PLAYER)
return;
- switch (target->getRace())
+ switch (target->GetRace())
{
// Blood Elf
case RACE_BLOODELF:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 17830 : 17829);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 17830 : 17829);
break;
// Orc
case RACE_ORC:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10140 : 10139);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10140 : 10139);
break;
// Troll
case RACE_TROLL:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10134 : 10135);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10134 : 10135);
break;
// Tauren
case RACE_TAUREN:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10147 : 10136);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10147 : 10136);
break;
// Undead
case RACE_UNDEAD_PLAYER:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10145 : 10146);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10145 : 10146);
break;
// Draenei
case RACE_DRAENEI:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 17828 : 17827);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 17828 : 17827);
break;
// Dwarf
case RACE_DWARF:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10142 : 10141);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10142 : 10141);
break;
// Gnome
case RACE_GNOME:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10149 : 10148);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10149 : 10148);
break;
// Human
case RACE_HUMAN:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10138 : 10137);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10138 : 10137);
break;
// Night Elf
case RACE_NIGHTELF:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 10144 : 10143);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 10144 : 10143);
break;
default:
break;
@@ -1909,47 +1909,47 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode,
if (target->GetTypeId() != TYPEID_PLAYER)
return;
- switch (target->getRace())
+ switch (target->GetRace())
{
// Blood Elf
case RACE_BLOODELF:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25043 : 25032);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25043 : 25032);
break;
// Orc
case RACE_ORC:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25050 : 25039);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25050 : 25039);
break;
// Troll
case RACE_TROLL:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25052 : 25041);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25052 : 25041);
break;
// Tauren
case RACE_TAUREN:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25051 : 25040);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25051 : 25040);
break;
// Undead
case RACE_UNDEAD_PLAYER:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25053 : 25042);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25053 : 25042);
break;
// Draenei
case RACE_DRAENEI:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25044 : 25033);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25044 : 25033);
break;
// Dwarf
case RACE_DWARF:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25045 : 25034);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25045 : 25034);
break;
// Gnome
case RACE_GNOME:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25035 : 25046);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25035 : 25046);
break;
// Human
case RACE_HUMAN:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25037 : 25048);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25037 : 25048);
break;
// Night Elf
case RACE_NIGHTELF:
- target->SetDisplayId(target->getGender() == GENDER_FEMALE ? 25038 : 25049);
+ target->SetDisplayId(target->GetGender() == GENDER_FEMALE ? 25038 : 25049);
break;
default:
break;
@@ -1963,15 +1963,15 @@ void AuraEffect::HandleAuraTransform(AuraApplication const* aurApp, uint8 mode,
// Honor the Dead
case 65386:
case 65495:
- target->SetDisplayId(target->getGender() == GENDER_MALE ? 29203 : 29204);
+ target->SetDisplayId(target->GetGender() == GENDER_MALE ? 29203 : 29204);
break;
// Darkspear Pride
case 75532:
- target->SetDisplayId(target->getGender() == GENDER_MALE ? 31737 : 31738);
+ target->SetDisplayId(target->GetGender() == GENDER_MALE ? 31737 : 31738);
break;
// Gnomeregan Pride
case 75531:
- target->SetDisplayId(target->getGender() == GENDER_MALE ? 31654 : 31655);
+ target->SetDisplayId(target->GetGender() == GENDER_MALE ? 31654 : 31655);
break;
default:
break;
@@ -4184,7 +4184,7 @@ void AuraEffect::HandleAuraModRangedAttackPower(AuraApplication const* aurApp, u
Unit* target = aurApp->GetTarget();
- if ((target->getClassMask() & CLASSMASK_WAND_USERS) != 0)
+ if ((target->GetClassMask() & CLASSMASK_WAND_USERS) != 0)
return;
target->HandleStatFlatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(GetAmount()), apply);
@@ -4214,7 +4214,7 @@ void AuraEffect::HandleAuraModRangedAttackPowerPercent(AuraApplication const* au
Unit* target = aurApp->GetTarget();
- if ((target->getClassMask() & CLASSMASK_WAND_USERS) != 0)
+ if ((target->GetClassMask() & CLASSMASK_WAND_USERS) != 0)
return;
//UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER = multiplier - 1
@@ -4447,7 +4447,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
{
if (caster)
{
- if (caster->getGender() == GENDER_FEMALE)
+ if (caster->GetGender() == GENDER_FEMALE)
caster->CastSpell(target, 37095, this); // Blood Elf Disguise
else
caster->CastSpell(target, 37093, this);
@@ -4464,7 +4464,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
case 46354: // Blood Elf Illusion
if (caster)
{
- if (caster->getGender() == GENDER_FEMALE)
+ if (caster->GetGender() == GENDER_FEMALE)
caster->CastSpell(target, 46356, this);
else
caster->CastSpell(target, 46355, this);
@@ -5819,7 +5819,7 @@ void AuraEffect::HandleOverridePetSpecs(AuraApplication const* aurApp, uint8 mod
if (!player)
return;
- if (player->getClass() != CLASS_HUNTER)
+ if (player->GetClass() != CLASS_HUNTER)
return;
Pet* pet = player->GetPet();
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 2bf12a82313..bf2dfcdb102 100644
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -451,7 +451,7 @@ m_spellInfo(createInfo._spellInfo), m_castDifficulty(createInfo._castDifficulty)
m_castItemGuid(createInfo.CastItemGUID), m_castItemId(createInfo.CastItemId),
m_castItemLevel(createInfo.CastItemLevel), m_spellVisual({ createInfo.Caster ? createInfo.Caster->GetCastSpellXSpellVisualId(createInfo._spellInfo) : createInfo._spellInfo->GetSpellXSpellVisualId(), 0 }),
m_applyTime(GameTime::GetGameTime()), m_owner(createInfo._owner), m_timeCla(0), m_updateTargetMapInterval(0),
-m_casterLevel(createInfo.Caster ? createInfo.Caster->getLevel() : m_spellInfo->SpellLevel), m_procCharges(0), m_stackAmount(1),
+m_casterLevel(createInfo.Caster ? createInfo.Caster->GetLevel() : m_spellInfo->SpellLevel), m_procCharges(0), m_stackAmount(1),
m_isRemoved(false), m_isSingleTarget(false), m_isUsingCharges(false), m_dropEvent(nullptr),
m_procCooldown(std::chrono::steady_clock::time_point::min()),
m_lastProcAttemptTime(std::chrono::steady_clock::now() - Seconds(10)), m_lastProcSuccessTime(std::chrono::steady_clock::now() - Seconds(120))
@@ -1889,8 +1889,8 @@ float Aura::CalcProcChance(SpellProcEntry const& procEntry, ProcEventInfo& event
}
// proc chance is reduced by an additional 3.333% per level past 60
- if ((procEntry.AttributesMask & PROC_ATTR_REDUCE_PROC_60) && eventInfo.GetActor()->getLevel() > 60)
- chance = std::max(0.f, (1.f - ((eventInfo.GetActor()->getLevel() - 60) * 1.f / 30.f)) * chance);
+ if ((procEntry.AttributesMask & PROC_ATTR_REDUCE_PROC_60) && eventInfo.GetActor()->GetLevel() > 60)
+ chance = std::max(0.f, (1.f - ((eventInfo.GetActor()->GetLevel() - 60) * 1.f / 30.f)) * chance);
return chance;
}
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:
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index c6659ea56cd..6a77c858e89 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -1442,11 +1442,11 @@ void Spell::EffectEnergize()
{
case 24571: // Blood Fury
// Instantly increases your rage by ${(300-10*$max(0,$PL-60))/10}.
- damage -= 10 * std::max(0, std::min(30, unitCaster->getLevel() - 60));
+ damage -= 10 * std::max(0, std::min(30, unitCaster->GetLevel() - 60));
break;
case 24532: // Burst of Energy
// Instantly increases your energy by ${60-4*$max(0,$min(15,$PL-60))}.
- damage -= 4 * std::max(0, std::min(15, unitCaster->getLevel() - 60));
+ damage -= 4 * std::max(0, std::min(15, unitCaster->GetLevel() - 60));
break;
case 67490: // Runic Mana Injector (mana gain increased by 25% for engineers - 3.2.0 patch change)
{
@@ -2276,7 +2276,7 @@ void Spell::EffectLearnSkill()
return;
uint32 skillid = effectInfo->MiscValue;
- SkillRaceClassInfoEntry const* rcEntry = sDB2Manager.GetSkillRaceClassInfo(skillid, unitTarget->getRace(), unitTarget->getClass());
+ SkillRaceClassInfoEntry const* rcEntry = sDB2Manager.GetSkillRaceClassInfo(skillid, unitTarget->GetRace(), unitTarget->GetClass());
if (!rcEntry)
return;
@@ -2538,7 +2538,7 @@ void Spell::EffectTameCreature()
if (creatureTarget->IsPet())
return;
- if (unitCaster->getClass() != CLASS_HUNTER)
+ if (unitCaster->GetClass() != CLASS_HUNTER)
return;
// cast finish successfully
@@ -3213,7 +3213,7 @@ void Spell::EffectDuel()
PhasingHandler::InheritPhaseShift(go, caster);
go->SetFaction(caster->GetFaction());
- go->SetLevel(caster->getLevel() + 1);
+ go->SetLevel(caster->GetLevel() + 1);
int32 duration = m_spellInfo->CalcDuration(caster);
go->SetRespawnTime(duration > 0 ? duration/IN_MILLISECONDS : 0);
go->SetSpellId(m_spellInfo->Id);
@@ -3474,7 +3474,7 @@ void Spell::EffectFeedPet()
ExecuteLogEffectDestroyItem(SpellEffectName(effectInfo->Effect), foodItem->GetEntry());
int32 pct;
- int32 levelDiff = int32(pet->getLevel()) - int32(foodItem->GetTemplate()->GetBaseItemLevel());
+ int32 levelDiff = int32(pet->GetLevel()) - int32(foodItem->GetTemplate()->GetBaseItemLevel());
if (levelDiff >= 30)
return;
else if (levelDiff >= 20)
@@ -3549,7 +3549,7 @@ void Spell::EffectSummonObject()
PhasingHandler::InheritPhaseShift(go, m_caster);
go->SetFaction(unitCaster->GetFaction());
- go->SetLevel(unitCaster->getLevel());
+ go->SetLevel(unitCaster->GetLevel());
int32 duration = m_spellInfo->CalcDuration(m_caster);
go->SetRespawnTime(duration > 0 ? duration / IN_MILLISECONDS : 0);
go->SetSpellId(m_spellInfo->Id);
@@ -4667,7 +4667,7 @@ void Spell::EffectCreateTamedPet()
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET)
return;
- if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || !unitTarget->GetPetGUID().IsEmpty() || unitTarget->getClass() != CLASS_HUNTER)
+ if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || !unitTarget->GetPetGUID().IsEmpty() || unitTarget->GetClass() != CLASS_HUNTER)
return;
uint32 creatureEntry = effectInfo->MiscValue;
@@ -4772,7 +4772,7 @@ void Spell::SummonGuardian(SpellEffectInfo const* effect, uint32 entry, SummonPr
unitCaster = unitCaster->ToTotem()->GetOwner();
// in another case summon new
- uint8 level = unitCaster->getLevel();
+ uint8 level = unitCaster->GetLevel();
// level of pet summoned using engineering item based at engineering skill level
if (m_CastItem && unitCaster->GetTypeId() == TYPEID_PLAYER)
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 4b1db88eb4f..21fab92e836 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -485,7 +485,7 @@ int32 SpellEffectInfo::CalcValue(WorldObject const* caster /*= nullptr*/, int32
{
if (casterUnit && basePointsPerLevel != 0.0f)
{
- int32 level = int32(casterUnit->getLevel());
+ int32 level = int32(casterUnit->GetLevel());
if (level > int32(_spellInfo->MaxLevel) && _spellInfo->MaxLevel > 0)
level = int32(_spellInfo->MaxLevel);
@@ -518,9 +518,9 @@ int32 SpellEffectInfo::CalcBaseValue(WorldObject const* caster, Unit const* targ
{
uint32 level = _spellInfo->SpellLevel;
if (target && _spellInfo->IsPositiveEffect(EffectIndex) && (Effect == SPELL_EFFECT_APPLY_AURA))
- level = target->getLevel();
+ level = target->GetLevel();
else if (caster && caster->IsUnit())
- level = caster->ToUnit()->getLevel();
+ level = caster->ToUnit()->GetLevel();
if (_spellInfo->BaseLevel && !_spellInfo->HasAttribute(SPELL_ATTR11_SCALES_WITH_ITEM_LEVEL) && _spellInfo->HasAttribute(SPELL_ATTR10_USE_SPELL_BASE_LEVEL_FOR_SCALING))
level = _spellInfo->BaseLevel;
@@ -589,7 +589,7 @@ int32 SpellEffectInfo::CalcBaseValue(WorldObject const* caster, Unit const* targ
if (ContentTuningEntry const* contentTuning = sContentTuningStore.LookupEntry(contentTuningId))
expansion = contentTuning->ExpansionID;
- int32 level = caster && caster->IsUnit() ? int32(caster->ToUnit()->getLevel()) : 1;
+ int32 level = caster && caster->IsUnit() ? int32(caster->ToUnit()->GetLevel()) : 1;
value = sDB2Manager.EvaluateExpectedStat(stat, level, expansion, 0, CLASS_NONE) * BasePoints / 100.0f;
}
@@ -641,7 +641,7 @@ float SpellEffectInfo::CalcRadius(WorldObject* caster /*= nullptr*/, Spell* spel
if (caster)
{
if (Unit* casterUnit = caster->ToUnit())
- radius += entry->RadiusPerLevel * casterUnit->getLevel();
+ radius += entry->RadiusPerLevel * casterUnit->GetLevel();
radius = std::min(radius, entry->RadiusMax);
@@ -3977,7 +3977,7 @@ Optional<SpellPowerCost> SpellInfo::CalcPowerCost(SpellPowerEntry const* power,
if (HasAttribute(SPELL_ATTR0_LEVEL_DAMAGE_CALCULATION))
{
GtNpcManaCostScalerEntry const* spellScaler = sNpcManaCostScalerGameTable.GetRow(SpellLevel);
- GtNpcManaCostScalerEntry const* casterScaler = sNpcManaCostScalerGameTable.GetRow(unitCaster->getLevel());
+ GtNpcManaCostScalerEntry const* casterScaler = sNpcManaCostScalerGameTable.GetRow(unitCaster->GetLevel());
if (spellScaler && casterScaler)
powerCost *= casterScaler->Scaler / spellScaler->Scaler;
}
@@ -4128,7 +4128,7 @@ float SpellInfo::CalcProcPPM(Unit* caster, int32 itemLevel) const
}
case SPELL_PPM_MOD_CLASS:
{
- if (caster->getClassMask() & mod->Param)
+ if (caster->GetClassMask() & mod->Param)
ppm *= 1.0f + mod->Coeff;
break;
}
@@ -4141,7 +4141,7 @@ float SpellInfo::CalcProcPPM(Unit* caster, int32 itemLevel) const
}
case SPELL_PPM_MOD_RACE:
{
- if (caster->getRaceMask() & mod->Param)
+ if (caster->GetRaceMask() & mod->Param)
ppm *= 1.0f + mod->Coeff;
break;
}
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 0cac85d1bf4..0f70ee71673 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -731,11 +731,11 @@ void SpellMgr::ForEachSpellInfoDifficulty(uint32 spellId, std::function<void(Spe
bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const
{
if (gender != GENDER_NONE) // is not expected gender
- if (!player || gender != player->getGender())
+ if (!player || gender != player->GetGender())
return false;
if (raceMask) // is not expected race
- if (!player || !raceMask.HasRace(player->getRace()))
+ if (!player || !raceMask.HasRace(player->GetRace()))
return false;
if (areaId) // is not in expected zone