*merge ScriptMgr::LoadOverridenDBCData to SpellMgrLoadSpellCustomAttr, patch by Azuritus, closes issue #444

--HG--
branch : trunk

3 files changed, 19 insertions, 37 deletions

diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp
index cad2fd97d19..d55182009d8 100644
--- a/src/game/ScriptMgr.cpp
+++ b/src/game/ScriptMgr.cpp
@@ -23,7 +23,6 @@ Config TScriptConfig;
 
 void FillSpellSummary();
 void LoadOverridenSQLData();
-void LoadOverridenDBCData();
 
 void ScriptMgr::LoadDatabase()
 {
@@ -110,8 +109,6 @@ void ScriptMgr::ScriptsInit(char const* cfg_file)
 
     outstring_log(">> Load Overriden SQL Data.");
     LoadOverridenSQLData();
-    outstring_log(">> Load Overriden DBC Data.");
-    LoadOverridenDBCData();
 }
 
 //*********************************
diff --git a/src/game/ScriptedCreature.cpp b/src/game/ScriptedCreature.cpp
index 5868b7e2fe9..103a8364026 100644
--- a/src/game/ScriptedCreature.cpp
+++ b/src/game/ScriptedCreature.cpp
@@ -718,40 +718,6 @@ void LoadOverridenSQLData()
             goInfo->trap.radius = 50;
 }
 
-void LoadOverridenDBCData()
-{
-    SpellEntry *spellInfo;
-    for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
-    {
-        spellInfo = GET_SPELL(i);
-        if(!spellInfo)
-            continue;
-
-        switch(i)
-        {
-            // Black Temple : Illidan : Parasitic Shadowfiend Passive
-            case 41013:
-                spellInfo->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
-                break;
-            // Naxxramas : Gothik : Inform Inf range
-            case 27892:
-            case 27928:
-            case 27935:
-            case 27915:
-            case 27931:
-            case 27937:
-                spellInfo->rangeIndex = 13;
-                break;
-            // Ulduar : Flame Leviathan : Pursued
-            case 62374:
-                spellInfo->MaxAffectedTargets = 1;
-                spellInfo->EffectImplicitTargetB[0] = TARGET_UNIT_AREA_ENTRY_SRC;
-                spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_AREA_ENTRY_SRC;
-                break;
-        }
-    }
-}
-
 // SD2 grid searchers.
 Creature *GetClosestCreatureWithEntry(WorldObject *pSource, uint32 uiEntry, float fMaxSearchRange, bool bAlive)
 {
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index c1b187fdad5..ab5e1086751 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -3830,6 +3830,25 @@ void SpellMgr::LoadSpellCustomAttr()
             spellInfo->AttributesEx5 |= SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY;
             count++;
             break;
+        case 41013:     // Parasitic Shadowfiend Passive
+            spellInfo->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
+            count++;
+            break;
+        case 27892:     // To Anchor 1
+        case 27928:     // To Anchor 1
+        case 27935:     // To Anchor 1
+        case 27915:     // Anchor to Skulls
+        case 27931:     // Anchor to Skulls
+        case 27937:     // Anchor to Skulls
+            spellInfo->rangeIndex = 13;
+            count++;
+            break;
+        case 62374:     // Pursued
+            spellInfo->MaxAffectedTargets = 1;
+            spellInfo->EffectImplicitTargetB[0] = TARGET_UNIT_AREA_ENTRY_SRC;
+            spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_AREA_ENTRY_SRC;
+            count++;
+            break;
         default:
             break;
         }