* Move all movable spell effects from core to DB. Needs DB support.

* Fix some compile errors made in previous commits.

--HG--
branch : trunk

3 files changed, 11 insertions, 47 deletions

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 313a9b6dbfd..99eadf34371 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -27,7 +27,6 @@
 class spell_gen_remove_flight_auras : public SpellHandlerScript
 {
     public:
-
         spell_gen_remove_flight_auras() : SpellHandlerScript("spell_gen_remove_flight_auras") {}
 
         class spell_gen_remove_flight_auras_SpellScript : public SpellScript
@@ -51,7 +50,7 @@ class spell_gen_remove_flight_auras : public SpellHandlerScript
         {
             return new spell_gen_remove_flight_auras_SpellScript;
         }
-}
+};
 
 void AddSC_generic_spell_scripts()
 {
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 790e5723056..44c40d9410d 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -113,22 +113,22 @@ class spell_mage_polymorph_cast_visual : public SpellHandlerScript
             }
         };
 
-        const uint32 spell_mage_polymorph_cast_visual_SpellScript::spell_list[6] =
-        {
-            SPELL_MAGE_SQUIRREL_FORM,
-            SPELL_MAGE_GIRAFFE_FORM,
-            SPELL_MAGE_SERPENT_FORM,
-            SPELL_MAGE_DRAGONHAWK_FORM,
-            SPELL_MAGE_WORGEN_FORM,
-            SPELL_MAGE_SHEEP_FORM
-        };
-
         SpellScript* GetSpellScript() const
         {
             return new spell_mage_polymorph_cast_visual_SpellScript();
         }
 };
 
+const uint32 spell_mage_polymorph_cast_visual::spell_mage_polymorph_cast_visual_SpellScript::spell_list[6] =
+{
+    SPELL_MAGE_SQUIRREL_FORM,
+    SPELL_MAGE_GIRAFFE_FORM,
+    SPELL_MAGE_SERPENT_FORM,
+    SPELL_MAGE_DRAGONHAWK_FORM,
+    SPELL_MAGE_WORGEN_FORM,
+    SPELL_MAGE_SHEEP_FORM
+};
+
 class spell_mage_summon_water_elemental : public SpellHandlerScript
 {
     public:
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index e9ebfa0ce5c..d6dcbef1364 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -26,7 +26,6 @@
 enum WarriorSpells
 {
     WARRIOR_SPELL_LAST_STAND_TRIGGERED           = 12976,
-    WARRIOR_SPELL_WARRIORS_WRATH_TRIGGERED       = 21887,
 };
 
 class spell_warr_last_stand : public SpellHandlerScript
@@ -62,41 +61,7 @@ class spell_warr_last_stand : public SpellHandlerScript
         }
 };
 
-class spell_warr_warriors_wrath : public SpellHandlerScript
-{
-    public:
-        spell_warr_warriors_wrath() : SpellHandlerScript("spell_warr_warriors_wrath") { }
-
-        class spell_warr_warriors_wrath_SpellScript : public SpellScript
-        {
-            bool Validate(SpellEntry const *spellEntry)
-            {
-                if (!sSpellStore.LookupEntry(WARRIOR_SPELL_WARRIORS_WRATH_TRIGGERED))
-                    return false;
-                return true;
-            }
-
-            void HandleDummy(SpellEffIndex effIndex)
-            {
-                if (Unit *unitTarget = GetHitUnit())
-                    GetCaster()->CastSpell(unitTarget, WARRIOR_SPELL_WARRIORS_WRATH_TRIGGERED, true);
-            }
-
-            void Register()
-            {
-                // add dummy effect spell handler to Warrior's Wrath
-                EffectHandlers += EffectHandlerFn(spell_warr_warriors_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
-            }
-        };
-
-        SpellScript *GetSpellScript() const
-        {
-            return new spell_warr_warriors_wrath_SpellScript();
-        }
-};
-
 void AddSC_warrior_spell_scripts()
 {
     new spell_warr_last_stand;
-    new spell_warr_warriors_wrath;
 }