*Fix crash.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-03-11 21:51:24 +01:00
parent c3026bc755
commit 5808c12f5e
3 changed files with 8 additions and 2 deletions
+5
View File
@@ -1010,6 +1010,11 @@ void Aura::SetStackAmount(uint8 stackAmount)
RefreshAura();
}
void Aura::InitStackAmount(uint8 stackAmount)
{
m_stackAmount = stackAmount;
}
bool Aura::modStackAmount(int32 num)
{
// Can`t mod
+1
View File
@@ -279,6 +279,7 @@ class TRINITY_DLL_SPEC Aura
//int32 GetModifierValuePerStack() {return m_modifier.m_amount / m_stackAmount;}
void SetStackAmount(uint8 num);
bool modStackAmount(int32 num); // return true if last charge dropped
void InitStackAmount(uint8 stackAmount);
uint32 GetAuraStateMask(){return m_auraStateMask;}
void SetAuraState(uint8 num){m_auraStateMask |= 1<<(num-1);} //modifies aura's aura state (not unit!)
void RefreshAura();
+2 -2
View File
@@ -3795,9 +3795,9 @@ bool Unit::AddAura(Aura *Aur)
{
// prevent adding stack more than once
stackModified=true;
Aur->SetStackAmount(i2->second->GetStackAmount());
Aur->InitStackAmount(i2->second->GetStackAmount());
if(Aur->GetStackAmount() < aurSpellInfo->StackAmount)
Aur->SetStackAmount(Aur->GetStackAmount()+1);
Aur->InitStackAmount(Aur->GetStackAmount()+1);
}
RemoveAura(i2,AURA_REMOVE_BY_STACK);
i2=m_Auras.lower_bound(spair);