diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-01-31 19:52:36 +0100 |
|---|---|---|
| committer | Nayd <dnpd.dd@gmail.com> | 2015-01-31 20:16:21 +0000 |
| commit | a46d2017230f10348a138af49aec784d28fde391 (patch) | |
| tree | 4be0763512e294d1d17202fee6e854336521f3e7 /src/server/game/Spells/Spell.cpp | |
| parent | 984877d6ead568c840d15f7f06f71a6aa7235981 (diff) | |
Core/Spells: Renamed SPELL_ATTR4_TRIGGERED to SPELL_ATTR4_CAN_CAST_WHILE_CASTING and adjusted trigger flags accordingly
(cherry picked from commit 6d70acbbd66959f7b6896a19ce3f2a25ccf94f2e)
Conflicts:
src/server/game/Spells/Spell.cpp
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8e415b06745..8f8295d57d1 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -574,8 +574,8 @@ m_caster((info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER && caster->GetCharme m_spellState = SPELL_STATE_NULL; _triggeredCastFlags = triggerFlags; - if (info->AttributesEx4 & SPELL_ATTR4_TRIGGERED) - _triggeredCastFlags = TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_EQUIPPED_ITEM_REQUIREMENT); + if (info->AttributesEx4 & SPELL_ATTR4_CAN_CAST_WHILE_CASTING) + _triggeredCastFlags = TriggerCastFlags(uint32(_triggeredCastFlags) | TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_CAST_DIRECTLY); m_CastItem = NULL; m_castItemGUID.Clear(); |