*Simply some writing of array pointer in aura functions.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-07 17:21:07 -05:00
parent 22eeafa996
commit e0a6e3aedc
2 changed files with 5 additions and 7 deletions
+2 -2
View File
@@ -410,8 +410,8 @@ m_auraSlot(MAX_AURAS), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),m_aura
{
if (m_auraFlags & (uint8(1) << i))
{
if (&currentBasePoints[0])
m_partAuras[i]=CreateAuraEffect(this, i,&currentBasePoints[0]+i, caster, NULL, formalCaster);
if (currentBasePoints)
m_partAuras[i]=CreateAuraEffect(this, i,&currentBasePoints[i], caster, NULL, formalCaster);
else
m_partAuras[i]=CreateAuraEffect(this, i, NULL , caster, NULL, formalCaster);
// correct flags if aura couldn't be created
+2 -4
View File
@@ -13595,9 +13595,7 @@ Aura * Unit::AddAuraEffect(uint32 spellId, uint8 effIndex, Unit* caster, int32 *
if (aur)
{
AuraEffect *aurEffect = CreateAuraEffect(aur, effIndex, basePoints, caster);
if (!aurEffect)
return aur;
if (!aur->SetPartAura(aurEffect, effIndex))
if (aurEffect && !aur->SetPartAura(aurEffect, effIndex))
delete aurEffect;
}
else
@@ -13606,7 +13604,7 @@ Aura * Unit::AddAuraEffect(uint32 spellId, uint8 effIndex, Unit* caster, int32 *
{
int32 amount[3];
amount[effIndex] = *basePoints;
aur = new Aura(spellInfo, 1<<effIndex, &amount[0], this ,caster);
aur = new Aura(spellInfo, 1<<effIndex, amount, this ,caster);
}
else
{