*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
a8d5d6fcf1
16 files changed
+139
-55
No files matched your search
+20
-1
@@ -2347,8 +2347,27 @@ void SpellMgr::LoadSpellLinked()
|
||||
continue;
|
||||
}
|
||||
|
||||
if(trigger > 0)
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
case 0: mSpellCustomAttr[trigger] |= SPELL_ATTR_CU_LINK_CAST; break;
|
||||
case 1: mSpellCustomAttr[trigger] |= SPELL_ATTR_CU_LINK_HIT; break;
|
||||
case 2: mSpellCustomAttr[trigger] |= SPELL_ATTR_CU_LINK_AURA; break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mSpellCustomAttr[-trigger] |= SPELL_ATTR_CU_LINK_REMOVE;
|
||||
}
|
||||
|
||||
if(type) //we will find a better way when more types are needed
|
||||
trigger += 1000000;
|
||||
{
|
||||
if(trigger > 0)
|
||||
trigger += SPELL_LINKED_MAX_SPELLS * type;
|
||||
else
|
||||
trigger -= SPELL_LINKED_MAX_SPELLS * type;
|
||||
}
|
||||
mSpellLinkedMap[trigger].push_back(effect);
|
||||
|
||||
++count;
|
||||
|
||||
Reference in new issue
Block a user