diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 2abc4553b..6d190aee5 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -939,7 +939,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // Do healing and triggers if (m_healing) { - bool crit = real_caster && real_caster->isSpellCrit(unitTarget, m_spellInfo, m_spellSchoolMask); + bool crit = real_caster && real_caster->IsSpellCrit(unitTarget, m_spellInfo, m_spellSchoolMask); uint32 addhealth = m_healing; if (crit) { diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index dd8ba3c36..852f2737c 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -8234,7 +8234,7 @@ bool Aura::IsCritFromAbilityAura(Unit* caster, uint32& damage) { if (!(*itr)->isAffectedOnSpell(m_spellProto)) continue; - if (!caster->isSpellCrit(m_target, m_spellProto, GetSpellSchoolMask(m_spellProto))) + if (!caster->IsSpellCrit(m_target, m_spellProto, GetSpellSchoolMask(m_spellProto))) break; damage = caster->SpellCriticalDamageBonus(m_spellProto, damage, m_target); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 680567f60..8204dc63a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1206,7 +1206,7 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, S return; // Check spell crit chance - bool crit = isSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType); + bool crit = IsSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType); bool blocked = false; // damage bonus (per damage class) @@ -1219,7 +1219,7 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, S //Calculate damage bonus damage = MeleeDamageBonus(pVictim, damage, attackType, spellInfo, SPELL_DIRECT_DAMAGE); // Get blocked status - blocked = pVictim->isSpellBlocked(this, spellInfo, attackType); + blocked = pVictim->IsSpellBlocked(this, spellInfo, attackType); // if crit add critical bonus if (crit) @@ -2671,7 +2671,7 @@ void Unit::SendMeleeAttackStop(Unit* victim) ((Creature*)victim)->AI().EnterEvadeMode(this);*/ } -bool Unit::isSpellBlocked(Unit *pCaster, SpellEntry const * /*spellProto*/, WeaponAttackType attackType) +bool Unit::IsSpellBlocked(Unit *pCaster, SpellEntry const * /*spellProto*/, WeaponAttackType attackType) { if (HasInArc(M_PI_F,pCaster)) { @@ -9316,7 +9316,7 @@ int32 Unit::SpellBaseDamageBonusForVictim(SpellSchoolMask schoolMask, Unit *pVic return TakenAdvertisedBenefit; } -bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType) +bool Unit::IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType) { // not critting spell if((spellProto->AttributesEx2 & SPELL_ATTR_EX2_CANT_CRIT)) diff --git a/src/game/Unit.h b/src/game/Unit.h index b7cc466a0..cbe061a9c 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1711,8 +1711,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject int32 SpellBaseHealingBonusForVictim(SpellSchoolMask schoolMask, Unit *pVictim); uint32 SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint32 damage, DamageEffectType damagetype, uint32 stack = 1); int32 SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, int32 healamount, DamageEffectType damagetype, uint32 stack = 1); - bool isSpellBlocked(Unit *pCaster, SpellEntry const *spellProto, WeaponAttackType attackType = BASE_ATTACK); - bool isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK); + bool IsSpellBlocked(Unit *pCaster, SpellEntry const *spellProto, WeaponAttackType attackType = BASE_ATTACK); + bool IsSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK); uint32 SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim); uint32 SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index adf12dfca..8c2972471 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9781" + #define REVISION_NR "9782" #endif // __REVISION_NR_H__