*Make amount of auras be more correct.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-08 00:55:43 +02:00
parent 01b0fc45cb
commit 9b908e4014
+11 -2
View File
@@ -462,7 +462,7 @@ m_target(parentAura->GetTarget())
m_effIndex = effIndex; m_effIndex = effIndex;
m_auraName = AuraType(m_spellProto->EffectApplyAuraName[m_effIndex]); m_auraName = AuraType(m_spellProto->EffectApplyAuraName[m_effIndex]);
if(currentBasePoints) /*if(currentBasePoints)
{ {
m_amount = *currentBasePoints; m_amount = *currentBasePoints;
m_currentBasePoints = m_amount - 1; 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); m_amount = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, m_target);
else else
m_amount = m_currentBasePoints + 1; 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()) if (!m_amount && castItem && castItem->GetItemSuffixFactor())
{ {