diff options
| author | Shauren <none@none> | 2010-08-21 20:50:38 +0200 |
|---|---|---|
| committer | Shauren <none@none> | 2010-08-21 20:50:38 +0200 |
| commit | 73d3f210a9df46d3725575663538a69cf58f0fda (patch) | |
| tree | 59dd52cdd7b1e6a099e5ef28aea8aa61f7914c2e /src/server/game/Spells/SpellScript.h | |
| parent | 97f98e9bbdb1a4c64738306eaca300b937e3c97c (diff) | |
Scripts/Icecrown Citadel: Add script for Deathbringer Saurfang (only missing alliance outro due to need of spawning and moving a transport)
Scripts/Icecrown Citadel: Corrected Lord Marrowgar, should no longer target tanks with Bone Spike Graveyard, his Coldflame should now spread properly
Core/Scripts: Moved Lady Deathwhisper Mana Barrier handler to scripts
Core/Scripts: Allow AuraScript to prevent default effects by effect index
Core/Scripts: Added Is25ManRaid() method to ScriptedAI, obviously used to check if raid is 25man
Core/Achievements: Pass m_caster to UpdateAchievementCriteria for ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Spells/SpellScript.h')
| -rw-r--r-- | src/server/game/Spells/SpellScript.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 6912cb18787..7a030614469 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -280,12 +280,12 @@ class AuraScript : public _SpellScript public: bool _Validate(SpellEntry const * entry, const char * scriptname); bool _Load(Aura * aura); - void _ResetDefault() { m_default = true; } - bool _IsDefaultActionPrevented(SpellEffIndex /*effIndex*/) {return !m_default;}; - void PreventDefaultAction() { m_default = false; }; + void _ResetDefault() { m_defaultPreventedEffectsMask = 0; } + bool _IsDefaultActionPrevented(SpellEffIndex effIndex) { return m_defaultPreventedEffectsMask & (1 << effIndex); } + void PreventDefaultAction(SpellEffIndex effIndex) { m_defaultPreventedEffectsMask |= 1 << effIndex; } private: Aura * m_aura; - bool m_default; + uint8 m_defaultPreventedEffectsMask; public: // // AuraScript interface |
