From 9b908e4014de8d4ef428c74f94c480405160cfa7 Mon Sep 17 00:00:00 2001 From: QAston Date: Wed, 8 Apr 2009 00:55:43 +0200 Subject: [PATCH] *Make amount of auras be more correct. --HG-- branch : trunk --- src/game/SpellAuras.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index f2721efb48..89d5a5578d 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -462,7 +462,7 @@ m_target(parentAura->GetTarget()) m_effIndex = effIndex; m_auraName = AuraType(m_spellProto->EffectApplyAuraName[m_effIndex]); - if(currentBasePoints) + /*if(currentBasePoints) { m_amount = *currentBasePoints; m_currentBasePoints = m_amount - 1; @@ -474,7 +474,16 @@ m_target(parentAura->GetTarget()) m_amount = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, m_target); else m_amount = m_currentBasePoints + 1; - } + }*/ + if(currentBasePoints) + m_currentBasePoints = *currentBasePoints; + else + m_currentBasePoints = m_spellProto->EffectBasePoints[m_effIndex]; + + if(caster) + m_amount = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, m_target); + else + m_amount = m_currentBasePoints + 1; if (!m_amount && castItem && castItem->GetItemSuffixFactor()) {