Merge commit 'origin/master' into 320

Conflicts:
	src/game/SpellAuras.cpp
This commit is contained in:
tomrus88 2009-09-26 19:51:04 +04:00
commit f06741d7c4
3 changed files with 10 additions and 2 deletions

View file

@ -340,7 +340,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleNoImmediateEffect, //287 SPELL_AURA_DEFLECT_SPELLS implemented in Unit::MagicSpellHitResult and Unit::MeleeSpellHitResult
&Aura::HandleUnused, //288 increase parry/deflect, prevent attack
&Aura::HandleUnused, //289 unused
&Aura::HandleUnused, //290 3 spells
&Aura::HandleAuraModAllCritChance, //290 SPELL_AURA_MOD_ALL_CRIT_CHANCE
&Aura::HandleUnused, //291 1 spell (+pct experience bonus)
&Aura::HandleNULL, //292 call stabled pet
&Aura::HandleNULL, //293 3 spells
@ -7417,3 +7417,9 @@ void Aura::HandleModTargetArmorPct(bool apply, bool Real)
((Player*)m_target)->UpdateArmorPenetration();
}
void Aura::HandleAuraModAllCritChance(bool apply, bool Real)
{
this->HandleAuraModCritPercent(apply, Real);
this->HandleModSpellCritChance(apply, Real);
}