diff options
| author | Drahy <none@none> | 2009-02-04 22:08:23 +0100 |
|---|---|---|
| committer | Drahy <none@none> | 2009-02-04 22:08:23 +0100 |
| commit | 674477ddf8678d81d116df88b33160fa6be303cb (patch) | |
| tree | 8dd3bac5ab94ee39d7b72588ce8fef231c70ddb0 /src/game/SpellAuras.cpp | |
| parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
| parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) | |
* Huge merge with original branch
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
| -rw-r--r-- | src/game/SpellAuras.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 49a69c11da1..5bab1316d4f 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -366,7 +366,7 @@ m_updated(false), m_isRemovedOnShapeLost(true), m_in_use(false) damage = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, target); else damage = m_currentBasePoints + 1; - } + } m_isPassive = IsPassiveSpell(GetId()); m_positive = IsPositiveEffect(GetId(), m_effIndex); @@ -1313,7 +1313,7 @@ void Aura::TriggerSpell() // // Five Fat Finger Exploding Heart Technique // case 27673: break; // Nitrous Boost - case 27746: + case 27746: { if (caster->GetPower(POWER_MANA) >= 10) { @@ -1621,7 +1621,7 @@ void Aura::TriggerSpell() (*i)->ApplyModifier(true); break; } - } + } }break; // // Dementia // case 41404: break; @@ -2270,7 +2270,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real) if (totem && totem->isTotem()) totem->AddPlayerToVision((Player*)caster); } - } + } else ((Player*)caster)->RemoveFarsightTarget(); return; @@ -3821,7 +3821,7 @@ void Aura::HandleAuraModSchoolImmunity(bool apply, bool Real) { if(apply && m_modifier.m_miscvalue == SPELL_SCHOOL_MASK_NORMAL) m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_UNATTACKABLE); - + m_target->ApplySpellImmune(GetId(),IMMUNITY_SCHOOL,m_modifier.m_miscvalue,apply); if(Real && apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY) @@ -5432,7 +5432,7 @@ void Aura::PeriodicTick() break; } case 41337:// aura of anger - { + { Unit::AuraList const& mMod = m_target->GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); for(Unit::AuraList::const_iterator i = mMod.begin(); i != mMod.end(); ++i) { @@ -5443,7 +5443,7 @@ void Aura::PeriodicTick() (*i)->ApplyModifier(true); break; } - } + } m_modifier.m_amount += 100; }break; default: |