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
This commit is contained in:
Shauren authored and Nayd committed 2015-01-31 20:16:21 +00:00
1 parent 984877d6ea
commit a46d201723
3 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -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();