From 43ac2c4cb44fb211fdd3142ec45fea9e53308ccd Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 16 Jul 2009 10:18:35 +0800
Subject:     [8172] Drop dead code for 33878/33876 and ranks. Author:
 VladimirMangos

    Detected by spell_check: not have now dummy aura but have
    SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCEN for proper mechanic.

--HG--
branch : trunk
---
 src/game/SpellEffects.cpp | 12 ------------
 src/game/Unit.cpp         |  5 ++---
 2 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 965627e58eb..33ab0ae98ca 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -530,18 +530,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                 {
                     damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.08f);
                 }
-                //Mangle Bonus for the initial damage of Lacerate and Rake
-                if((m_spellInfo->SpellFamilyFlags.IsEqual(0x1000,0,0) && m_spellInfo->SpellIconID==494) ||
-                    (m_spellInfo->SpellFamilyFlags.IsEqual(0,0x100,0) && m_spellInfo->SpellIconID==2246))
-                {
-                    Unit::AuraEffectList const& mDummyAuras = unitTarget->GetAurasByType(SPELL_AURA_DUMMY);
-                    for(Unit::AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
-                        if((*i)->GetSpellProto()->SpellFamilyFlags[1] & 0x00000440 && (*i)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DRUID)
-                        {
-                            damage = int32(damage*(100.0f+(*i)->GetAmount())/100.0f);
-                            break;
-                        }
-                }
                 break;
             }
             case SPELLFAMILY_ROGUE:
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index eede4b4bed2..67cd87db8a5 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5907,7 +5907,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         triggered_spell_id = 40446;
                         chance = 25.0f;
                     }
-                    // Mangle (cat/bear)
+                    // Mangle (Bear) and Mangle (Cat)
                     else if( procSpell->SpellFamilyFlags[1] & 0x00000440)
                     {
                         triggered_spell_id = 40452;
@@ -9324,8 +9324,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
 
     // Mod damage from spell mechanic
-    uint32 mechanicMask = GetAllSpellMechanicMask(spellProto);
-    if (mechanicMask)
+    if (uint32 mechanicMask = GetAllSpellMechanicMask(spellProto))
     {
         AuraEffectList const& mDamageDoneMechanic = pVictim->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT);
         for(AuraEffectList::const_iterator i = mDamageDoneMechanic.begin();i != mDamageDoneMechanic.end(); ++i)
-- 
cgit v1.2.3