From 615e0f777353d01421bcd54d5b91da90ecb49a18 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Fri, 28 Nov 2008 15:47:18 -0600
Subject: *Do not let mark of the wild stack (different ranks, different
 effects).

--HG--
branch : trunk
---
 src/game/SpellMgr.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index fa0fbaa9e8a..3ef75606803 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1212,6 +1212,9 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
     //    && spellInfo_1->SpellIconID == spellInfo_2->SpellIconID)
     //    return true; // maybe change this to IsRankSpellDueToSpell?
 
+    if(spellInfo_1->SpellFamilyName && IsRankSpellDueToSpell(spellInfo_1, spellId_2))
+        return true;
+
     //if spells have exactly the same effect they cannot stack
     for(uint32 i = 0; i < 3; ++i)
         if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i]
-- 
cgit v1.2.3