aboutsummaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorclick <none@none>2010-04-20 00:11:03 +0200
committerclick <none@none>2010-04-20 00:11:03 +0200
commita5500fd7f1df88e1a23c9b250ec0568cdd4d9c02 (patch)
tree0074da6471abf3269b00f2777b196ca6bd270e29 /src/game
parente1e7083990a8422d7b8e649765bdb1ff6a78cd8c (diff)
Make ResetPeriodic controllable by boolean value, defaults to false
Fix by Moriquendu --HG-- branch : trunk
Diffstat (limited to 'src/game')
-rw-r--r--src/game/SpellAuraEffects.h2
-rw-r--r--src/game/Unit.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/SpellAuraEffects.h b/src/game/SpellAuraEffects.h
index 03dd12fd9b4..72311c71032 100644
--- a/src/game/SpellAuraEffects.h
+++ b/src/game/SpellAuraEffects.h
@@ -62,7 +62,7 @@ class AuraEffect
uint32 GetTickNumber() const { return m_tickNumber; }
int32 GetTotalTicks() const { return m_amplitude ? (GetBase()->GetMaxDuration() / m_amplitude) : 1;}
- void ResetPeriodic() {m_periodicTimer = m_amplitude; m_tickNumber = 0;}
+ void ResetPeriodic(bool resetPeriodicTimer = false) { if(resetPeriodicTimer) m_periodicTimer = m_amplitude; m_tickNumber = 0;}
bool IsPeriodic() const { return m_isPeriodic; }
bool IsAffectedOnSpell(SpellEntry const *spell) const;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 2f62ed6a0ee..fcfdd7fb026 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7636,7 +7636,7 @@ bool Unit::HandleAuraProc(Unit * /*pVictim*/, uint32 damage, Aura * triggeredByA
if (!aurEff)
return false;
// Reset amplitude - set death rune remove timer to 30s
- aurEff->ResetPeriodic();
+ aurEff->ResetPeriodic(true);
uint32 runesLeft;
if (dummySpell->SpellIconID == 2622)