diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-07-31 19:03:06 +0200 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-07-31 21:58:25 +0200 |
| commit | 58f10c74f72f4bdf00dcf200ce11528d005906cd (patch) | |
| tree | 36c1239988cde21d760342dad8550b51c02c3c30 /src/server/game/Spells/Spell.h | |
| parent | 8753a182631cc7930e7c652092b7176812932435 (diff) | |
Core/Spells: Change low level bool triggered with bitmask TriggerCastFlags to better manipulate the behaviour of certain triggered spells.
Diffstat (limited to 'src/server/game/Spells/Spell.h')
| -rwxr-xr-x | src/server/game/Spells/Spell.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index c4a86788482..9007f44e26d 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -379,7 +379,7 @@ class Spell typedef std::set<Aura*> UsedSpellMods; - Spell(Unit* Caster, SpellInfo const *info, bool triggered, uint64 originalCasterGUID = 0, bool skipCheck = false); + Spell(Unit* caster, SpellInfo const *info, TriggerCastFlags triggerFlags, uint64 originalCasterGUID = 0, bool skipCheck = false); ~Spell(); void prepare(SpellCastTargets const* targets, AuraEffect const* triggeredByAura = NULL); @@ -474,7 +474,7 @@ class Spell void SetAutoRepeat(bool rep) { m_autoRepeat = rep; } void ReSetTimer() { m_timer = m_casttime > 0 ? m_casttime : 0; } bool IsNextMeleeSwingSpell() const; - bool IsTriggered() const {return m_IsTriggeredSpell;}; + bool IsTriggered() const {return _triggeredCastFlags & TRIGGERED_FULL_MASK;}; bool IsChannelActive() const { return m_caster->GetUInt32Value(UNIT_CHANNEL_SPELL) != 0; } bool IsAutoActionResetSpell() const; @@ -672,7 +672,7 @@ class Spell uint32 m_spellState; uint32 m_timer; - bool m_IsTriggeredSpell; + TriggerCastFlags _triggeredCastFlags; // if need this can be replaced by Aura copy // we can't store original aura link to prevent access to deleted auras |