*Update aura check to make drink/food not stackable. Also fixes Mark of the Wild stacking.

--HG--
branch : trunk

2 files changed, 42 insertions, 25 deletions

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 8d842bd63a6..52ffec5e67f 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -135,6 +135,16 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
 
     switch(spellInfo->SpellFamilyName)
     {
+        case SPELLFAMILY_GENERIC:
+        {
+            // needed to make some strange drinks unstackable (brewfest and normal drink)
+            if (spellInfo->Attributes & SPELL_ATTR_CASTABLE_WHILE_SITTING
+                && spellInfo->Attributes & SPELL_ATTR_CANT_USED_IN_COMBAT)
+                    for(int i = 0; i < 3; i++)
+                        if( spellInfo->EffectApplyAuraName[i]==)
+                            return SPELL_DRINK;
+            break;
+        }
         case SPELLFAMILY_MAGE:
         {
             // family flags 18(Molten), 25(Frost/Ice), 28(Mage)
@@ -247,6 +257,7 @@ bool IsSingleFromSpellSpecificPerCaster(uint32 spellSpec1,uint32 spellSpec2)
         case SPELL_POSITIVE_SHOUT:
         case SPELL_JUDGEMENT:
         case SPELL_WARLOCK_CORRUPTION:
+        case SPELL_DRINK:
             return spellSpec1==spellSpec2;
         default:
             return false;
@@ -1156,8 +1167,9 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
     // generic spells
     if(!spellInfo_1->SpellFamilyName)
     {
-        if(!spellInfo_1->SpellIconID 
-            || spellInfo_1->SpellIconID != spellInfo_2->SpellIconID)
+        if(!spellInfo_1->SpellIconID
+            || (spellInfo_1->SpellIconID != spellInfo_2->SpellIconID
+               && spellInfo_1->SpellVisual != spellInfo_2->SpellVisual)) //needed for 44098 and 19709 to make it unstackable
             return false;
     }
 
@@ -1175,34 +1187,38 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
             return false;
     }
 
+    if( !sameCaster)
+        for(uint32 i = 0; i < 3; ++i)
+        {
+            if (spellInfo_1->Effect[i] != SPELL_EFFECT_APPLY_AREA_AURA_PARTY) // not area auras (shaman totem)
+            // a better check may be effect == SPELL_EFFECT_APPLY_AURA
+                switch(spellInfo_1->EffectApplyAuraName[i])
+                {
+                    // DOT or HOT from different casters will stack
+                    case SPELL_AURA_PERIODIC_DAMAGE:
+                    case SPELL_AURA_PERIODIC_HEAL:
+                    case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
+                    case SPELL_AURA_PERIODIC_ENERGIZE:
+                    case SPELL_AURA_PERIODIC_MANA_LEECH:
+                    case SPELL_AURA_PERIODIC_LEECH:
+                        return false;
+                    default:
+                        break;
+                }
+        }
+
+    //spells with the same icon (check needed when spell has different effects in other ranks example:Mark of the wild)
+    if(spellInfo_1->SpellIconID 
+        && spellInfo_1->SpellIconID == spellInfo_2->SpellIconID)
+        return true; // maybe change this to IsRankSpellDueToSpell?
+
+    //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]
             || spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i]
             || spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i]) // paladin resist aura
             return false; // need itemtype check? need an example to add that check
 
-        if(spellInfo_1->EffectApplyAuraName[i] // both spell has the same auras
-            && !sameCaster
-            && spellInfo_1->Effect[i] != SPELL_EFFECT_APPLY_AREA_AURA_PARTY) // not area auras (shaman totem)
-            // a better check may be effect == SPELL_EFFECT_APPLY_AURA
-        {
-            switch(spellInfo_1->EffectApplyAuraName[i])
-            {
-                // DOT or HOT from different casters will stack
-                case SPELL_AURA_PERIODIC_DAMAGE:
-                case SPELL_AURA_PERIODIC_HEAL:
-                case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
-                case SPELL_AURA_PERIODIC_ENERGIZE:
-                case SPELL_AURA_PERIODIC_MANA_LEECH:
-                case SPELL_AURA_PERIODIC_LEECH:
-                    return false;
-                default:
-                    break;
-            }
-        }
-    }
-
     return true;
 }
 
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index f5394470ae3..33cbaa0f358 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -263,7 +263,8 @@ enum SpellSpecific
     SPELL_BATTLE_ELIXIR     = 14,
     SPELL_GUARDIAN_ELIXIR   = 15,
     SPELL_FLASK_ELIXIR      = 16,
-    SPELL_WARLOCK_CORRUPTION= 17
+    SPELL_WARLOCK_CORRUPTION= 17,
+    SPELL_DRINK= 18
 };
 
 SpellSpecific GetSpellSpecific(uint32 spellId);