mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9782] Small clean up in 2 method names

Browse source
This commit is contained in:
Laise 2010-04-23 16:04:52 +03:00
parent 6cff390de2
commit d1dd6a8ca3
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Spell.cpp
View file

@ -939,7 +939,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
// Do healing and triggers // Do healing and triggers
if (m_healing) 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; uint32 addhealth = m_healing;
if (crit) if (crit)
{ {

2
src/game/SpellAuras.cpp
View file

@ -8234,7 +8234,7 @@ bool Aura::IsCritFromAbilityAura(Unit* caster, uint32& damage)
{ {
if (!(*itr)->isAffectedOnSpell(m_spellProto)) if (!(*itr)->isAffectedOnSpell(m_spellProto))
continue; continue;
if (!caster->isSpellCrit(m_target, m_spellProto, GetSpellSchoolMask(m_spellProto))) if (!caster->IsSpellCrit(m_target, m_spellProto, GetSpellSchoolMask(m_spellProto)))
break; break;
damage = caster->SpellCriticalDamageBonus(m_spellProto, damage, m_target); damage = caster->SpellCriticalDamageBonus(m_spellProto, damage, m_target);

8
src/game/Unit.cpp
View file

@ -1206,7 +1206,7 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, S
return; return;
// Check spell crit chance // Check spell crit chance
bool crit = isSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType); bool crit = IsSpellCrit(pVictim, spellInfo, damageSchoolMask, attackType);
bool blocked = false; bool blocked = false;
// damage bonus (per damage class) // damage bonus (per damage class)
@ -1219,7 +1219,7 @@ void Unit::CalculateSpellDamage(SpellNonMeleeDamage *damageInfo, int32 damage, S
//Calculate damage bonus //Calculate damage bonus
damage = MeleeDamageBonus(pVictim, damage, attackType, spellInfo, SPELL_DIRECT_DAMAGE); damage = MeleeDamageBonus(pVictim, damage, attackType, spellInfo, SPELL_DIRECT_DAMAGE);
// Get blocked status // Get blocked status
blocked = pVictim->isSpellBlocked(this, spellInfo, attackType); blocked = pVictim->IsSpellBlocked(this, spellInfo, attackType);
// if crit add critical bonus // if crit add critical bonus
if (crit) if (crit)
@ -2671,7 +2671,7 @@ void Unit::SendMeleeAttackStop(Unit* victim)
((Creature*)victim)->AI().EnterEvadeMode(this);*/ ((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)) if (HasInArc(M_PI_F,pCaster))
{ {
@ -9316,7 +9316,7 @@ int32 Unit::SpellBaseDamageBonusForVictim(SpellSchoolMask schoolMask, Unit *pVic
return TakenAdvertisedBenefit; 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 // not critting spell
if((spellProto->AttributesEx2 & SPELL_ATTR_EX2_CANT_CRIT)) if((spellProto->AttributesEx2 & SPELL_ATTR_EX2_CANT_CRIT))

4
src/game/Unit.h
View file

@ -1711,8 +1711,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
int32 SpellBaseHealingBonusForVictim(SpellSchoolMask schoolMask, Unit *pVictim); int32 SpellBaseHealingBonusForVictim(SpellSchoolMask schoolMask, Unit *pVictim);
uint32 SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint32 damage, DamageEffectType damagetype, uint32 stack = 1); 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); 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 IsSpellBlocked(Unit *pCaster, SpellEntry const *spellProto, WeaponAttackType attackType = BASE_ATTACK);
bool isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, 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 SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim);
uint32 SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim); uint32 SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9781" #define REVISION_NR "9782"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__