Changeset 67 for trunk/src/game/SpellMgr.cpp

Timestamp:

11/19/08 13:31:10 (17 years ago)

Author:

yumileroy

Message:

[svn] Change aura stack check.
Add some boss yells. Patched provided by BroodWyrm? and Blaymoira.

Original author: megamage
Date: 2008-10-19 13:56:11-05:00

Files:

• trunk/src/game/SpellMgr.cpp (modified) (1 diff)

trunk/src/game/SpellMgr.cpp

@@ -1346 +1346 @@
     }
 
-    // more generic checks
-    if (spellInfo_1->SpellIconID == spellInfo_2->SpellIconID &&
-        spellInfo_1->SpellIconID != 0 && spellInfo_2->SpellIconID != 0)
-    {
-        bool isModifier = false;
-        for (int i = 0; i < 3; i++)
-        {
-            if (spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER ||
-                spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER  ||
-                spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER ||
-                spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER )
-                isModifier = true;
-        }
-
-        if (!isModifier)
-            return true;
-    }
-
     if (IsRankSpellDueToSpell(spellInfo_1, spellId_2))
         return true;
 
-    if (spellInfo_1->SpellFamilyName == 0 || spellInfo_2->SpellFamilyName == 0)
+    if (spellInfo_1->SpellIconID != spellInfo_2->SpellIconID ||
+        !spellInfo_1->SpellIconID)
         return false;