Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.

-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.

Two minor changes in addition :

-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.

15 files changed, 401 insertions, 402 deletions

diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 6a6ee144aac..1637f588eef 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -79,7 +79,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader
 
         class spell_dk_anti_magic_shell_raid_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_anti_magic_shell_raid_AuraScript);
+            PrepareAuraScript(spell_dk_anti_magic_shell_raid_AuraScript)
 
             uint32 absorbPct;
 
@@ -121,7 +121,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader
 
         class spell_dk_anti_magic_shell_self_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_anti_magic_shell_self_AuraScript);
+            PrepareAuraScript(spell_dk_anti_magic_shell_self_AuraScript)
 
             uint32 absorbPct, hpPct;
             bool Load() override
@@ -178,7 +178,7 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader
 
         class spell_dk_anti_magic_zone_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_anti_magic_zone_AuraScript);
+            PrepareAuraScript(spell_dk_anti_magic_zone_AuraScript)
 
             uint32 absorbPct;
 
@@ -229,7 +229,7 @@ class spell_dk_blood_boil : public SpellScriptLoader
 
         class spell_dk_blood_boil_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_blood_boil_SpellScript);
+            PrepareSpellScript(spell_dk_blood_boil_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -275,7 +275,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader
 
         class spell_dk_blood_gorged_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_blood_gorged_AuraScript);
+            PrepareAuraScript(spell_dk_blood_gorged_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -349,7 +349,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader
 
         class spell_dk_corpse_explosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_corpse_explosion_SpellScript);
+            PrepareSpellScript(spell_dk_corpse_explosion_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -448,7 +448,7 @@ class spell_dk_death_coil : public SpellScriptLoader
 
         class spell_dk_death_coil_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_death_coil_SpellScript);
+            PrepareSpellScript(spell_dk_death_coil_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -515,7 +515,7 @@ class spell_dk_death_gate : public SpellScriptLoader
 
         class spell_dk_death_gate_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_death_gate_SpellScript);
+            PrepareSpellScript(spell_dk_death_gate_SpellScript)
 
             SpellCastResult CheckClass()
             {
@@ -556,7 +556,7 @@ class spell_dk_death_grip : public SpellScriptLoader
 
         class spell_dk_death_grip_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_death_grip_SpellScript);
+            PrepareSpellScript(spell_dk_death_grip_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -590,7 +590,7 @@ class spell_dk_death_pact : public SpellScriptLoader
 
         class spell_dk_death_pact_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_death_pact_SpellScript);
+            PrepareSpellScript(spell_dk_death_pact_SpellScript)
 
             SpellCastResult CheckCast()
             {
@@ -646,7 +646,7 @@ class spell_dk_death_strike : public SpellScriptLoader
 
         class spell_dk_death_strike_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_death_strike_SpellScript);
+            PrepareSpellScript(spell_dk_death_strike_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -690,7 +690,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader
 
         class spell_dk_ghoul_explode_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_ghoul_explode_SpellScript);
+            PrepareSpellScript(spell_dk_ghoul_explode_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -738,7 +738,7 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader
 
         class spell_dk_icebound_fortitude_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_icebound_fortitude_AuraScript);
+            PrepareAuraScript(spell_dk_icebound_fortitude_AuraScript)
 
             bool Load() override
             {
@@ -787,7 +787,7 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader
 
         class spell_dk_improved_blood_presence_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_improved_blood_presence_AuraScript);
+            PrepareAuraScript(spell_dk_improved_blood_presence_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -834,7 +834,7 @@ class spell_dk_improved_frost_presence : public SpellScriptLoader
 
         class spell_dk_improved_frost_presence_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_improved_frost_presence_AuraScript);
+            PrepareAuraScript(spell_dk_improved_frost_presence_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -881,7 +881,7 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader
 
         class spell_dk_improved_unholy_presence_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_improved_unholy_presence_AuraScript);
+            PrepareAuraScript(spell_dk_improved_unholy_presence_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -941,7 +941,7 @@ class spell_dk_presence : public SpellScriptLoader
 
         class spell_dk_presence_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_presence_AuraScript);
+            PrepareAuraScript(spell_dk_presence_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1057,7 +1057,7 @@ class spell_dk_raise_dead : public SpellScriptLoader
 
         class spell_dk_raise_dead_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_raise_dead_SpellScript);
+            PrepareSpellScript(spell_dk_raise_dead_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -1190,7 +1190,7 @@ class spell_dk_rune_tap_party : public SpellScriptLoader
 
         class spell_dk_rune_tap_party_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_rune_tap_party_SpellScript);
+            PrepareSpellScript(spell_dk_rune_tap_party_SpellScript)
 
             void CheckTargets(std::list<WorldObject*>& targets)
             {
@@ -1217,7 +1217,7 @@ class spell_dk_scent_of_blood : public SpellScriptLoader
 
         class spell_dk_scent_of_blood_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_scent_of_blood_AuraScript);
+            PrepareAuraScript(spell_dk_scent_of_blood_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1253,7 +1253,7 @@ class spell_dk_scourge_strike : public SpellScriptLoader
 
         class spell_dk_scourge_strike_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dk_scourge_strike_SpellScript);
+            PrepareSpellScript(spell_dk_scourge_strike_SpellScript)
             float multiplier;
 
             bool Load() override
@@ -1316,7 +1316,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader
 
         class spell_dk_spell_deflection_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_spell_deflection_AuraScript);
+            PrepareAuraScript(spell_dk_spell_deflection_AuraScript)
 
             uint32 absorbPct;
 
@@ -1360,7 +1360,7 @@ class spell_dk_vampiric_blood : public SpellScriptLoader
 
         class spell_dk_vampiric_blood_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_vampiric_blood_AuraScript);
+            PrepareAuraScript(spell_dk_vampiric_blood_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -1387,7 +1387,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader
 
         class spell_dk_will_of_the_necropolis_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dk_will_of_the_necropolis_AuraScript);
+            PrepareAuraScript(spell_dk_will_of_the_necropolis_AuraScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index e466c15d417..e16b3113545 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -54,7 +54,7 @@ class spell_dru_dash : public SpellScriptLoader
 
         class spell_dru_dash_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_dash_AuraScript);
+            PrepareAuraScript(spell_dru_dash_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -83,7 +83,7 @@ class spell_dru_enrage : public SpellScriptLoader
 
         class spell_dru_enrage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_enrage_SpellScript);
+            PrepareSpellScript(spell_dru_enrage_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -119,7 +119,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader
 
         class spell_dru_glyph_of_starfire_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript);
+            PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -172,7 +172,7 @@ class spell_dru_idol_lifebloom : public SpellScriptLoader
 
         class spell_dru_idol_lifebloom_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_idol_lifebloom_AuraScript);
+            PrepareAuraScript(spell_dru_idol_lifebloom_AuraScript)
 
             void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
             {
@@ -207,7 +207,7 @@ class spell_dru_innervate : public SpellScriptLoader
 
         class spell_dru_innervate_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_innervate_AuraScript);
+            PrepareAuraScript(spell_dru_innervate_AuraScript)
 
             void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -234,7 +234,7 @@ class spell_dru_insect_swarm : public SpellScriptLoader
 
         class spell_dru_insect_swarm_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_insect_swarm_AuraScript);
+            PrepareAuraScript(spell_dru_insect_swarm_AuraScript)
 
             void CalculateAmount(AuraEffect const* aurEff, int32 & amount, bool & /*canBeRecalculated*/)
             {
@@ -263,7 +263,7 @@ class spell_dru_lifebloom : public SpellScriptLoader
 
         class spell_dru_lifebloom_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_lifebloom_AuraScript);
+            PrepareAuraScript(spell_dru_lifebloom_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -345,7 +345,7 @@ class spell_dru_living_seed : public SpellScriptLoader
 
         class spell_dru_living_seed_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_living_seed_AuraScript);
+            PrepareAuraScript(spell_dru_living_seed_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -381,7 +381,7 @@ class spell_dru_living_seed_proc : public SpellScriptLoader
 
         class spell_dru_living_seed_proc_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_living_seed_proc_AuraScript);
+            PrepareAuraScript(spell_dru_living_seed_proc_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -416,7 +416,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader
 
         class spell_dru_moonkin_form_passive_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_moonkin_form_passive_AuraScript);
+            PrepareAuraScript(spell_dru_moonkin_form_passive_AuraScript)
 
             uint32 absorbPct;
 
@@ -460,7 +460,7 @@ class spell_dru_owlkin_frenzy : public SpellScriptLoader
 
         class spell_dru_owlkin_frenzy_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_owlkin_frenzy_AuraScript);
+            PrepareAuraScript(spell_dru_owlkin_frenzy_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -487,7 +487,7 @@ class spell_dru_predatory_strikes : public SpellScriptLoader
 
         class spell_dru_predatory_strikes_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_predatory_strikes_AuraScript);
+            PrepareAuraScript(spell_dru_predatory_strikes_AuraScript)
 
             void UpdateAmount(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -516,7 +516,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader
 
         class spell_dru_primal_tenacity_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_primal_tenacity_AuraScript);
+            PrepareAuraScript(spell_dru_primal_tenacity_AuraScript)
 
             uint32 absorbPct;
 
@@ -560,7 +560,7 @@ class spell_dru_rip : public SpellScriptLoader
 
         class spell_dru_rip_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_rip_AuraScript);
+            PrepareAuraScript(spell_dru_rip_AuraScript)
 
             bool Load() override
             {
@@ -608,7 +608,7 @@ class spell_dru_savage_defense : public SpellScriptLoader
 
         class spell_dru_savage_defense_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_savage_defense_AuraScript);
+            PrepareAuraScript(spell_dru_savage_defense_AuraScript)
 
             uint32 absorbPct;
 
@@ -651,7 +651,7 @@ class spell_dru_savage_roar : public SpellScriptLoader
 
         class spell_dru_savage_roar_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_savage_roar_SpellScript);
+            PrepareSpellScript(spell_dru_savage_roar_SpellScript)
 
             SpellCastResult CheckCast()
             {
@@ -670,7 +670,7 @@ class spell_dru_savage_roar : public SpellScriptLoader
 
         class spell_dru_savage_roar_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_savage_roar_AuraScript);
+            PrepareAuraScript(spell_dru_savage_roar_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -716,7 +716,7 @@ class spell_dru_starfall_aoe : public SpellScriptLoader
 
         class spell_dru_starfall_aoe_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_starfall_aoe_SpellScript);
+            PrepareSpellScript(spell_dru_starfall_aoe_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -743,7 +743,7 @@ class spell_dru_starfall_dummy : public SpellScriptLoader
 
         class spell_dru_starfall_dummy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_starfall_dummy_SpellScript);
+            PrepareSpellScript(spell_dru_starfall_dummy_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -789,7 +789,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader
 
         class spell_dru_survival_instincts_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_survival_instincts_SpellScript);
+            PrepareSpellScript(spell_dru_survival_instincts_SpellScript)
 
             SpellCastResult CheckCast()
             {
@@ -808,7 +808,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader
 
         class spell_dru_survival_instincts_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_survival_instincts_AuraScript);
+            PrepareAuraScript(spell_dru_survival_instincts_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -855,7 +855,7 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader
 
         class spell_dru_swift_flight_passive_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_dru_swift_flight_passive_AuraScript);
+            PrepareAuraScript(spell_dru_swift_flight_passive_AuraScript)
 
             bool Load() override
             {
@@ -889,7 +889,7 @@ class spell_dru_tiger_s_fury : public SpellScriptLoader
 
         class spell_dru_tiger_s_fury_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_tiger_s_fury_SpellScript);
+            PrepareSpellScript(spell_dru_tiger_s_fury_SpellScript)
 
             void OnHit()
             {
@@ -917,7 +917,7 @@ class spell_dru_typhoon : public SpellScriptLoader
 
         class spell_dru_typhoon_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_typhoon_SpellScript);
+            PrepareSpellScript(spell_dru_typhoon_SpellScript)
 
             void HandleKnockBack(SpellEffIndex effIndex)
             {
@@ -946,7 +946,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader
 
         class spell_dru_t10_restoration_4p_bonus_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_t10_restoration_4p_bonus_SpellScript);
+            PrepareSpellScript(spell_dru_t10_restoration_4p_bonus_SpellScript)
 
             bool Load() override
             {
@@ -1018,7 +1018,7 @@ class spell_dru_wild_growth : public SpellScriptLoader
 
         class spell_dru_wild_growth_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_dru_wild_growth_SpellScript);
+            PrepareSpellScript(spell_dru_wild_growth_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 77a4faa7e8c..5c90109998e 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -45,7 +45,7 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader
 
         class spell_gen_absorb0_hitlimit1_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_absorb0_hitlimit1_AuraScript);
+            PrepareAuraScript(spell_gen_absorb0_hitlimit1_AuraScript)
 
             uint32 limit;
 
@@ -90,7 +90,7 @@ class spell_gen_adaptive_warding : public SpellScriptLoader
 
         class spell_gen_adaptive_warding_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_adaptive_warding_AuraScript);
+            PrepareAuraScript(spell_gen_adaptive_warding_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -171,7 +171,7 @@ class spell_gen_allow_cast_from_item_only : public SpellScriptLoader
 
         class spell_gen_allow_cast_from_item_only_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_allow_cast_from_item_only_SpellScript);
+            PrepareSpellScript(spell_gen_allow_cast_from_item_only_SpellScript)
 
             SpellCastResult CheckRequirement()
             {
@@ -205,7 +205,7 @@ class spell_gen_animal_blood : public SpellScriptLoader
 
         class spell_gen_animal_blood_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_animal_blood_AuraScript);
+            PrepareAuraScript(spell_gen_animal_blood_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -249,7 +249,7 @@ class spell_gen_aura_of_anger : public SpellScriptLoader
 
         class spell_gen_aura_of_anger_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_aura_of_anger_AuraScript);
+            PrepareAuraScript(spell_gen_aura_of_anger_AuraScript)
 
             void HandleEffectPeriodicUpdate(AuraEffect* aurEff)
             {
@@ -287,7 +287,7 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader
 
         class spell_gen_aura_service_uniform_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_aura_service_uniform_AuraScript);
+            PrepareAuraScript(spell_gen_aura_service_uniform_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -336,7 +336,7 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader
 
         class spell_gen_av_drekthar_presence_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_av_drekthar_presence_AuraScript);
+            PrepareAuraScript(spell_gen_av_drekthar_presence_AuraScript)
 
             bool CheckAreaTarget(Unit* target)
             {
@@ -384,7 +384,7 @@ class spell_gen_bandage : public SpellScriptLoader
 
         class spell_gen_bandage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_bandage_SpellScript);
+            PrepareSpellScript(spell_gen_bandage_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -436,7 +436,7 @@ class spell_gen_bonked : public SpellScriptLoader
 
         class spell_gen_bonked_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_bonked_SpellScript);
+            PrepareSpellScript(spell_gen_bonked_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -586,7 +586,7 @@ class spell_gen_burn_brutallus : public SpellScriptLoader
 
         class spell_gen_burn_brutallus_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_burn_brutallus_AuraScript);
+            PrepareAuraScript(spell_gen_burn_brutallus_AuraScript)
 
             void HandleEffectPeriodicUpdate(AuraEffect* aurEff)
             {
@@ -618,7 +618,7 @@ class spell_gen_cannibalize : public SpellScriptLoader
 
         class spell_gen_cannibalize_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_cannibalize_SpellScript);
+            PrepareSpellScript(spell_gen_cannibalize_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -706,7 +706,7 @@ class spell_gen_clone : public SpellScriptLoader
 
         class spell_gen_clone_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_clone_SpellScript);
+            PrepareSpellScript(spell_gen_clone_SpellScript)
 
             void HandleScriptEffect(SpellEffIndex effIndex)
             {
@@ -746,7 +746,7 @@ class spell_gen_clone_weapon : public SpellScriptLoader
 
         class spell_gen_clone_weapon_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_clone_weapon_SpellScript);
+            PrepareSpellScript(spell_gen_clone_weapon_SpellScript)
 
             void HandleScriptEffect(SpellEffIndex effIndex)
             {
@@ -773,7 +773,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader
 
         class spell_gen_clone_weapon_auraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_clone_weapon_auraScript);
+            PrepareAuraScript(spell_gen_clone_weapon_auraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -940,7 +940,7 @@ class spell_gen_create_lance : public SpellScriptLoader
 
         class spell_gen_create_lance_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_create_lance_SpellScript);
+            PrepareSpellScript(spell_gen_create_lance_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -982,7 +982,7 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader
 
         class spell_gen_creature_permanent_feign_death_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_creature_permanent_feign_death_AuraScript);
+            PrepareAuraScript(spell_gen_creature_permanent_feign_death_AuraScript)
 
             void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -1024,7 +1024,7 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader
 
         class spell_gen_dalaran_disguise_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_dalaran_disguise_SpellScript);
+            PrepareSpellScript(spell_gen_dalaran_disguise_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -1096,7 +1096,7 @@ class spell_gen_damage_reduction_aura : public SpellScriptLoader
 
         class spell_gen_damage_reduction_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_damage_reduction_AuraScript);
+            PrepareAuraScript(spell_gen_damage_reduction_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1151,7 +1151,7 @@ class spell_gen_defend : public SpellScriptLoader
 
         class spell_gen_defend_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_defend_AuraScript);
+            PrepareAuraScript(spell_gen_defend_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1230,7 +1230,7 @@ class spell_gen_despawn_self : public SpellScriptLoader
 
         class spell_gen_despawn_self_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_despawn_self_SpellScript);
+            PrepareSpellScript(spell_gen_despawn_self_SpellScript)
 
             bool Load() override
             {
@@ -1268,7 +1268,7 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader
 
         class spell_gen_divine_storm_cd_reset_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript);
+            PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript)
 
             bool Load() override
             {
@@ -1308,7 +1308,7 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader
 
         class spell_gen_ds_flush_knockback_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_ds_flush_knockback_SpellScript);
+            PrepareSpellScript(spell_gen_ds_flush_knockback_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1351,7 +1351,7 @@ class spell_gen_dummy_trigger : public SpellScriptLoader
 
         class spell_gen_dummy_trigger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_dummy_trigger_SpellScript);
+            PrepareSpellScript(spell_gen_dummy_trigger_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1390,7 +1390,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader
 
         class spell_gen_dungeon_credit_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_dungeon_credit_SpellScript);
+            PrepareSpellScript(spell_gen_dungeon_credit_SpellScript)
 
             bool Load() override
             {
@@ -1445,7 +1445,8 @@ class spell_gen_elune_candle : public SpellScriptLoader
 
         class spell_gen_elune_candle_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_elune_candle_SpellScript);
+            PrepareSpellScript(spell_gen_elune_candle_SpellScript)
+
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 if (!sSpellMgr->GetSpellInfo(SPELL_ELUNE_CANDLE_OMEN_HEAD) ||
@@ -1554,7 +1555,7 @@ class spell_gen_gift_of_naaru : public SpellScriptLoader
 
         class spell_gen_gift_of_naaru_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_gift_of_naaru_AuraScript);
+            PrepareAuraScript(spell_gen_gift_of_naaru_AuraScript)
 
             void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -1646,7 +1647,7 @@ class spell_gen_gunship_portal : public SpellScriptLoader
 
         class spell_gen_gunship_portal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_gunship_portal_SpellScript);
+            PrepareSpellScript(spell_gen_gunship_portal_SpellScript)
 
             bool Load() override
             {
@@ -1685,7 +1686,7 @@ class spell_gen_launch : public SpellScriptLoader
 
         class spell_gen_launch_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_launch_SpellScript);
+            PrepareSpellScript(spell_gen_launch_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1733,7 +1734,7 @@ class spell_gen_lifeblood : public SpellScriptLoader
 
         class spell_gen_lifeblood_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_lifeblood_AuraScript);
+            PrepareAuraScript(spell_gen_lifeblood_AuraScript)
 
             void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -1769,7 +1770,7 @@ class spell_gen_lifebloom : public SpellScriptLoader
 
         class spell_gen_lifebloom_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_lifebloom_AuraScript);
+            PrepareAuraScript(spell_gen_lifebloom_AuraScript)
 
         public:
             spell_gen_lifebloom_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { }
@@ -1823,7 +1824,7 @@ class spell_gen_magic_rooster : public SpellScriptLoader
 
         class spell_gen_magic_rooster_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_magic_rooster_SpellScript);
+            PrepareSpellScript(spell_gen_magic_rooster_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1922,7 +1923,7 @@ class spell_gen_mount : public SpellScriptLoader
 
         class spell_gen_mount_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_mount_SpellScript);
+            PrepareSpellScript(spell_gen_mount_SpellScript)
 
         public:
             spell_gen_mount_SpellScript(uint32 mount0, uint32 mount60, uint32 mount100, uint32 mount150, uint32 mount280, uint32 mount310) : SpellScript(),
@@ -2210,7 +2211,7 @@ class spell_gen_netherbloom : public SpellScriptLoader
 
         class spell_gen_netherbloom_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_netherbloom_SpellScript);
+            PrepareSpellScript(spell_gen_netherbloom_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2268,7 +2269,7 @@ class spell_gen_nightmare_vine : public SpellScriptLoader
 
         class spell_gen_nightmare_vine_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_nightmare_vine_SpellScript);
+            PrepareSpellScript(spell_gen_nightmare_vine_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2319,7 +2320,7 @@ class spell_gen_obsidian_armor : public SpellScriptLoader
 
         class spell_gen_obsidian_armor_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_obsidian_armor_AuraScript);
+            PrepareAuraScript(spell_gen_obsidian_armor_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2490,7 +2491,7 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader
 
         class spell_gen_on_tournament_mount_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_on_tournament_mount_AuraScript);
+            PrepareAuraScript(spell_gen_on_tournament_mount_AuraScript)
 
             uint32 _pennantSpellId;
 
@@ -2648,7 +2649,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader
 
         class spell_gen_oracle_wolvar_reputation_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript);
+            PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript)
 
             bool Load() override
             {
@@ -2700,7 +2701,7 @@ class spell_gen_orc_disguise : public SpellScriptLoader
 
         class spell_gen_orc_disguise_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_orc_disguise_SpellScript);
+            PrepareSpellScript(spell_gen_orc_disguise_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2750,7 +2751,7 @@ class spell_gen_parachute : public SpellScriptLoader
 
         class spell_gen_parachute_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_parachute_AuraScript);
+            PrepareAuraScript(spell_gen_parachute_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2829,7 +2830,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader
 
         class spell_gen_pet_summoned_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_pet_summoned_SpellScript);
+            PrepareSpellScript(spell_gen_pet_summoned_SpellScript)
 
             bool Load() override
             {
@@ -2842,30 +2843,28 @@ class spell_gen_pet_summoned : public SpellScriptLoader
                 if (player->GetLastPetNumber())
                 {
                     PetType newPetType = (player->getClass() == CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET;
-                    if (Pet* newPet = new Pet(player, newPetType))
+                    auto newPet = new Pet(player, newPetType);
+                    if (newPet->LoadPetFromDB(player, 0, player->GetLastPetNumber(), true))
                     {
-                        if (newPet->LoadPetFromDB(player, 0, player->GetLastPetNumber(), true))
-                        {
-                            // revive the pet if it is dead
-                            if (newPet->getDeathState() == DEAD)
-                                newPet->setDeathState(ALIVE);
+                        // revive the pet if it is dead
+                        if (newPet->getDeathState() == DEAD)
+                            newPet->setDeathState(ALIVE);
 
-                            newPet->SetFullHealth();
-                            newPet->SetPower(newPet->getPowerType(), newPet->GetMaxPower(newPet->getPowerType()));
+                        newPet->SetFullHealth();
+                        newPet->SetPower(newPet->getPowerType(), newPet->GetMaxPower(newPet->getPowerType()));
 
-                            switch (newPet->GetEntry())
-                            {
-                                case NPC_DOOMGUARD:
-                                case NPC_INFERNAL:
-                                    newPet->SetEntry(NPC_IMP);
-                                    break;
-                                default:
-                                    break;
-                            }
+                        switch (newPet->GetEntry())
+                        {
+                            case NPC_DOOMGUARD:
+                            case NPC_INFERNAL:
+                                newPet->SetEntry(NPC_IMP);
+                                break;
+                            default:
+                                break;
                         }
-                        else
-                            delete newPet;
                     }
+                    else
+                        delete newPet;
                 }
             }
 
@@ -2888,7 +2887,7 @@ class spell_gen_profession_research : public SpellScriptLoader
 
         class spell_gen_profession_research_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_profession_research_SpellScript);
+            PrepareSpellScript(spell_gen_profession_research_SpellScript)
 
             bool Load() override
             {
@@ -2938,7 +2937,7 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader
 
         class spell_gen_remove_flight_auras_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_remove_flight_auras_SpellScript);
+            PrepareSpellScript(spell_gen_remove_flight_auras_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2986,7 +2985,7 @@ class spell_gen_replenishment : public SpellScriptLoader
 
         class spell_gen_replenishment_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_replenishment_SpellScript);
+            PrepareSpellScript(spell_gen_replenishment_SpellScript)
 
             void RemoveInvalidTargets(std::list<WorldObject*>& targets)
             {
@@ -3025,7 +3024,7 @@ class spell_gen_replenishment : public SpellScriptLoader
 
         class spell_gen_replenishment_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_replenishment_AuraScript);
+            PrepareAuraScript(spell_gen_replenishment_AuraScript)
 
             bool Load() override
             {
@@ -3071,7 +3070,7 @@ class spell_gen_seaforium_blast : public SpellScriptLoader
 
         class spell_gen_seaforium_blast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_seaforium_blast_SpellScript);
+            PrepareSpellScript(spell_gen_seaforium_blast_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -3149,7 +3148,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader
 
         class spell_gen_spirit_healer_res_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_spirit_healer_res_SpellScript);
+            PrepareSpellScript(spell_gen_spirit_healer_res_SpellScript)
 
             bool Load() override
             {
@@ -3192,7 +3191,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader
 
         class spell_gen_summon_elemental_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_summon_elemental_AuraScript);
+            PrepareAuraScript(spell_gen_summon_elemental_AuraScript)
 
         public:
             spell_gen_summon_elemental_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { }
@@ -3250,7 +3249,7 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader
 
         class spell_gen_summon_tournament_mount_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_summon_tournament_mount_SpellScript);
+            PrepareSpellScript(spell_gen_summon_tournament_mount_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -3293,7 +3292,7 @@ class spell_gen_throw_shield : public SpellScriptLoader
 
         class spell_gen_throw_shield_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_throw_shield_SpellScript);
+            PrepareSpellScript(spell_gen_throw_shield_SpellScript)
 
             void HandleScriptEffect(SpellEffIndex effIndex)
             {
@@ -3326,7 +3325,7 @@ class spell_gen_tournament_duel : public SpellScriptLoader
 
         class spell_gen_tournament_duel_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_tournament_duel_SpellScript);
+            PrepareSpellScript(spell_gen_tournament_duel_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -3372,7 +3371,7 @@ class spell_gen_tournament_pennant : public SpellScriptLoader
 
         class spell_gen_tournament_pennant_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_tournament_pennant_AuraScript);
+            PrepareAuraScript(spell_gen_tournament_pennant_AuraScript)
 
             bool Load() override
             {
@@ -3413,7 +3412,7 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader
 
         class spell_pvp_trinket_wotf_shared_cd_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pvp_trinket_wotf_shared_cd_SpellScript);
+            PrepareSpellScript(spell_pvp_trinket_wotf_shared_cd_SpellScript)
 
             bool Load() override
             {
@@ -3459,7 +3458,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader
 
         class spell_gen_turkey_marker_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_turkey_marker_AuraScript);
+            PrepareAuraScript(spell_gen_turkey_marker_AuraScript)
 
             void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
             {
@@ -3513,7 +3512,7 @@ class spell_gen_upper_deck_create_foam_sword : public SpellScriptLoader
 
         class spell_gen_upper_deck_create_foam_sword_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_upper_deck_create_foam_sword_SpellScript);
+            PrepareSpellScript(spell_gen_upper_deck_create_foam_sword_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -3555,7 +3554,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader
 
         class spell_gen_vehicle_scaling_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript);
+            PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript)
 
             bool Load() override
             {
@@ -3644,7 +3643,7 @@ class spell_gen_wg_water : public SpellScriptLoader
 
         class spell_gen_wg_water_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_wg_water_SpellScript);
+            PrepareSpellScript(spell_gen_wg_water_SpellScript)
 
             SpellCastResult CheckCast()
             {
@@ -3677,7 +3676,7 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader
 
         class spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript);
+            PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -3711,7 +3710,7 @@ class spell_gen_eject_all_passengers : public SpellScriptLoader
 
         class spell_gen_eject_all_passengers_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gen_eject_all_passengers_SpellScript);
+            PrepareSpellScript(spell_gen_eject_all_passengers_SpellScript)
 
             void RemoveVehicleAuras()
             {
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index dc0c70975dd..08984fd86d4 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -48,7 +48,7 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader
 
         class spell_love_is_in_the_air_romantic_picnic_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_love_is_in_the_air_romantic_picnic_AuraScript);
+            PrepareAuraScript(spell_love_is_in_the_air_romantic_picnic_AuraScript)
 
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -134,7 +134,7 @@ class spell_hallow_end_trick : public SpellScriptLoader
 
         class spell_hallow_end_trick_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hallow_end_trick_SpellScript);
+            PrepareSpellScript(spell_hallow_end_trick_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -207,7 +207,7 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader
 
         class spell_hallow_end_trick_or_treat_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript);
+            PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -245,7 +245,7 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader
 
         class spell_hallow_end_tricky_treat_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript);
+            PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -347,7 +347,7 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader
 
         class spell_winter_veil_mistletoe_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript);
+            PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -395,7 +395,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader
 
         class spell_winter_veil_px_238_winter_wondervolt_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt_SpellScript);
+            PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 2739a8453df..eaefe3f8631 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -65,7 +65,7 @@ class spell_hun_aspect_of_the_beast : public SpellScriptLoader
 
         class spell_hun_aspect_of_the_beast_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hun_aspect_of_the_beast_AuraScript);
+            PrepareAuraScript(spell_hun_aspect_of_the_beast_AuraScript)
 
             bool Load() override
             {
@@ -114,7 +114,7 @@ class spell_hun_ascpect_of_the_viper : public SpellScriptLoader
 
         class spell_hun_ascpect_of_the_viper_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hun_ascpect_of_the_viper_AuraScript);
+            PrepareAuraScript(spell_hun_ascpect_of_the_viper_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -175,7 +175,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader
 
         class spell_hun_chimera_shot_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_chimera_shot_SpellScript);
+            PrepareSpellScript(spell_hun_chimera_shot_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -268,7 +268,7 @@ class spell_hun_disengage : public SpellScriptLoader
 
         class spell_hun_disengage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_disengage_SpellScript);
+            PrepareSpellScript(spell_hun_disengage_SpellScript)
 
             SpellCastResult CheckCast()
             {
@@ -299,7 +299,7 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader
 
         class spell_hun_improved_mend_pet_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hun_improved_mend_pet_AuraScript);
+            PrepareAuraScript(spell_hun_improved_mend_pet_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -339,7 +339,7 @@ class spell_hun_invigoration : public SpellScriptLoader
 
         class spell_hun_invigoration_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_invigoration_SpellScript);
+            PrepareSpellScript(spell_hun_invigoration_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -376,7 +376,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader
 
         class spell_hun_last_stand_pet_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_last_stand_pet_SpellScript);
+            PrepareSpellScript(spell_hun_last_stand_pet_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -412,7 +412,7 @@ class spell_hun_masters_call : public SpellScriptLoader
 
         class spell_hun_masters_call_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_masters_call_SpellScript);
+            PrepareSpellScript(spell_hun_masters_call_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -464,7 +464,7 @@ class spell_hun_misdirection : public SpellScriptLoader
 
         class spell_hun_misdirection_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hun_misdirection_AuraScript);
+            PrepareAuraScript(spell_hun_misdirection_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -512,7 +512,7 @@ class spell_hun_misdirection_proc : public SpellScriptLoader
 
         class spell_hun_misdirection_proc_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hun_misdirection_proc_AuraScript);
+            PrepareAuraScript(spell_hun_misdirection_proc_AuraScript)
 
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -539,7 +539,7 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader
 
         class spell_hun_pet_carrion_feeder_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript);
+            PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript)
 
             bool Load() override
             {
@@ -596,7 +596,7 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader
 
         class spell_hun_pet_heart_of_the_phoenix_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript);
+            PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript)
 
             bool Load() override
             {
@@ -643,7 +643,7 @@ class spell_hun_readiness : public SpellScriptLoader
 
         class spell_hun_readiness_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_readiness_SpellScript);
+            PrepareSpellScript(spell_hun_readiness_SpellScript)
 
             bool Load() override
             {
@@ -692,7 +692,7 @@ class spell_hun_scatter_shot : public SpellScriptLoader
 
         class spell_hun_scatter_shot_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_scatter_shot_SpellScript);
+            PrepareSpellScript(spell_hun_scatter_shot_SpellScript)
 
             bool Load() override
             {
@@ -728,7 +728,7 @@ class spell_hun_sniper_training : public SpellScriptLoader
 
         class spell_hun_sniper_training_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hun_sniper_training_AuraScript);
+            PrepareAuraScript(spell_hun_sniper_training_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -782,7 +782,7 @@ class spell_hun_tame_beast : public SpellScriptLoader
 
         class spell_hun_tame_beast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_tame_beast_SpellScript);
+            PrepareSpellScript(spell_hun_tame_beast_SpellScript)
 
             SpellCastResult CheckCast()
             {
@@ -835,7 +835,7 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader
 
         class spell_hun_target_only_pet_and_owner_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hun_target_only_pet_and_owner_SpellScript);
+            PrepareSpellScript(spell_hun_target_only_pet_and_owner_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -866,7 +866,7 @@ class spell_hun_viper_attack_speed : public SpellScriptLoader
 
         class spell_hun_viper_attack_speed_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hun_viper_attack_speed_AuraScript);
+            PrepareAuraScript(spell_hun_viper_attack_speed_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index be3b48b114d..41e0dcbebca 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -40,7 +40,7 @@ class spell_item_trigger_spell : public SpellScriptLoader
 
         class spell_item_trigger_spell_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_trigger_spell_SpellScript);
+            PrepareSpellScript(spell_item_trigger_spell_SpellScript)
         private:
             uint32 _triggeredSpellId;
 
@@ -86,7 +86,7 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader
 
         class spell_item_aegis_of_preservation_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_aegis_of_preservation_AuraScript);
+            PrepareAuraScript(spell_item_aegis_of_preservation_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -121,7 +121,7 @@ class spell_item_arcane_shroud : public SpellScriptLoader
 
         class spell_item_arcane_shroud_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_arcane_shroud_AuraScript);
+            PrepareAuraScript(spell_item_arcane_shroud_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -155,7 +155,7 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader
 
         class spell_item_blessing_of_ancient_kings_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_blessing_of_ancient_kings_AuraScript);
+            PrepareAuraScript(spell_item_blessing_of_ancient_kings_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -215,7 +215,7 @@ class spell_item_defibrillate : public SpellScriptLoader
 
         class spell_item_defibrillate_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_defibrillate_SpellScript);
+            PrepareSpellScript(spell_item_defibrillate_SpellScript)
 
         public:
             spell_item_defibrillate_SpellScript(uint8 chance, uint32 failSpell) : SpellScript(), _chance(chance), _failSpell(failSpell) { }
@@ -270,7 +270,7 @@ class spell_item_desperate_defense : public SpellScriptLoader
 
         class spell_item_desperate_defense_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_desperate_defense_AuraScript);
+            PrepareAuraScript(spell_item_desperate_defense_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -315,7 +315,7 @@ class spell_item_deviate_fish : public SpellScriptLoader
 
         class spell_item_deviate_fish_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_deviate_fish_SpellScript);
+            PrepareSpellScript(spell_item_deviate_fish_SpellScript)
 
             bool Load() override
             {
@@ -357,7 +357,7 @@ class spell_item_echoes_of_light : public SpellScriptLoader
 
         class spell_item_echoes_of_light_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_echoes_of_light_SpellScript);
+            PrepareSpellScript(spell_item_echoes_of_light_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -399,7 +399,7 @@ class spell_item_flask_of_the_north : public SpellScriptLoader
 
         class spell_item_flask_of_the_north_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_flask_of_the_north_SpellScript);
+            PrepareSpellScript(spell_item_flask_of_the_north_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -468,7 +468,7 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader
 
         class spell_item_gnomish_death_ray_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript);
+            PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -519,7 +519,7 @@ class spell_item_make_a_wish : public SpellScriptLoader
 
         class spell_item_make_a_wish_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_make_a_wish_SpellScript);
+            PrepareSpellScript(spell_item_make_a_wish_SpellScript)
 
             bool Load() override
             {
@@ -568,7 +568,7 @@ class spell_item_mingos_fortune_generator : public SpellScriptLoader
 
         class spell_item_mingos_fortune_generator_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_mingos_fortune_generator_SpellScript);
+            PrepareSpellScript(spell_item_mingos_fortune_generator_SpellScript)
 
             void HandleDummy(SpellEffIndex effIndex)
             {
@@ -628,7 +628,7 @@ class spell_item_necrotic_touch : public SpellScriptLoader
 
         class spell_item_necrotic_touch_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_necrotic_touch_AuraScript);
+            PrepareAuraScript(spell_item_necrotic_touch_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -678,7 +678,7 @@ class spell_item_net_o_matic : public SpellScriptLoader
 
         class spell_item_net_o_matic_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_net_o_matic_SpellScript);
+            PrepareSpellScript(spell_item_net_o_matic_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -730,7 +730,7 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader
 
         class spell_item_noggenfogger_elixir_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript);
+            PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript)
 
             bool Load() override
             {
@@ -777,7 +777,7 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader
 
         class spell_item_piccolo_of_the_flaming_fire_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_piccolo_of_the_flaming_fire_SpellScript);
+            PrepareSpellScript(spell_item_piccolo_of_the_flaming_fire_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -815,7 +815,7 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader
 
         class spell_item_savory_deviate_delight_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript);
+            PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript)
 
             bool Load() override
             {
@@ -876,7 +876,7 @@ class spell_item_scroll_of_recall : public SpellScriptLoader
 
         class spell_item_scroll_of_recall_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_scroll_of_recall_SpellScript);
+            PrepareSpellScript(spell_item_scroll_of_recall_SpellScript)
 
             bool Load() override
             {
@@ -943,7 +943,7 @@ class spell_item_unsated_craving : public SpellScriptLoader
 
         class spell_item_unsated_craving_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_unsated_craving_AuraScript);
+            PrepareAuraScript(spell_item_unsated_craving_AuraScript)
 
             bool CheckProc(ProcEventInfo& procInfo)
             {
@@ -977,7 +977,7 @@ class spell_item_shadows_fate : public SpellScriptLoader
 
         class spell_item_shadows_fate_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_shadows_fate_AuraScript);
+            PrepareAuraScript(spell_item_shadows_fate_AuraScript)
 
             void HandleProc(ProcEventInfo& procInfo)
             {
@@ -1018,7 +1018,7 @@ class spell_item_shadowmourne : public SpellScriptLoader
 
         class spell_item_shadowmourne_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_shadowmourne_AuraScript);
+            PrepareAuraScript(spell_item_shadowmourne_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1075,7 +1075,7 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader
 
         class spell_item_shadowmourne_soul_fragment_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_shadowmourne_soul_fragment_AuraScript);
+            PrepareAuraScript(spell_item_shadowmourne_soul_fragment_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1144,7 +1144,7 @@ class spell_item_six_demon_bag : public SpellScriptLoader
 
         class spell_item_six_demon_bag_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_six_demon_bag_SpellScript);
+            PrepareSpellScript(spell_item_six_demon_bag_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1204,7 +1204,7 @@ class spell_item_the_eye_of_diminution : public SpellScriptLoader
 
         class spell_item_the_eye_of_diminution_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_item_the_eye_of_diminution_AuraScript);
+            PrepareAuraScript(spell_item_the_eye_of_diminution_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -1241,7 +1241,7 @@ class spell_item_underbelly_elixir : public SpellScriptLoader
 
         class spell_item_underbelly_elixir_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_underbelly_elixir_SpellScript);
+            PrepareSpellScript(spell_item_underbelly_elixir_SpellScript)
 
             bool Load() override
             {
@@ -1292,7 +1292,7 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader
 
         class spell_item_red_rider_air_rifle_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_red_rider_air_rifle_SpellScript);
+            PrepareSpellScript(spell_item_red_rider_air_rifle_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1357,7 +1357,7 @@ class spell_item_create_heart_candy : public SpellScriptLoader
 
         class spell_item_create_heart_candy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_create_heart_candy_SpellScript);
+            PrepareSpellScript(spell_item_create_heart_candy_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -1388,7 +1388,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader
 
         class spell_item_book_of_glyph_mastery_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript);
+            PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript)
 
             bool Load() override
             {
@@ -1442,7 +1442,7 @@ class spell_item_gift_of_the_harvester : public SpellScriptLoader
 
         class spell_item_gift_of_the_harvester_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_gift_of_the_harvester_SpellScript);
+            PrepareSpellScript(spell_item_gift_of_the_harvester_SpellScript)
 
             SpellCastResult CheckRequirement()
             {
@@ -1483,7 +1483,7 @@ class spell_item_map_of_the_geyser_fields : public SpellScriptLoader
 
         class spell_item_map_of_the_geyser_fields_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_map_of_the_geyser_fields_SpellScript);
+            PrepareSpellScript(spell_item_map_of_the_geyser_fields_SpellScript)
 
             SpellCastResult CheckSinkholes()
             {
@@ -1523,7 +1523,7 @@ class spell_item_vanquished_clutches : public SpellScriptLoader
 
         class spell_item_vanquished_clutches_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_vanquished_clutches_SpellScript);
+            PrepareSpellScript(spell_item_vanquished_clutches_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1574,7 +1574,7 @@ class spell_item_ashbringer : public SpellScriptLoader
 
         class spell_item_ashbringer_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_ashbringer_SpellScript);
+            PrepareSpellScript(spell_item_ashbringer_SpellScript)
 
             bool Load() override
             {
@@ -1623,7 +1623,7 @@ class spell_magic_eater_food : public SpellScriptLoader
 
         class spell_magic_eater_food_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_magic_eater_food_AuraScript);
+            PrepareAuraScript(spell_magic_eater_food_AuraScript)
 
             void HandleTriggerSpell(AuraEffect const* /*aurEff*/)
             {
@@ -1671,7 +1671,7 @@ class spell_item_shimmering_vessel : public SpellScriptLoader
 
         class spell_item_shimmering_vessel_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_shimmering_vessel_SpellScript);
+            PrepareSpellScript(spell_item_shimmering_vessel_SpellScript)
 
             void HandleDummy(SpellEffIndex /* effIndex */)
             {
@@ -1704,7 +1704,7 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader
 
         class spell_item_purify_helboar_meat_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_purify_helboar_meat_SpellScript);
+            PrepareSpellScript(spell_item_purify_helboar_meat_SpellScript)
 
             bool Load() override
             {
@@ -1748,7 +1748,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader
 
         class spell_item_crystal_prison_dummy_dnd_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript);
+            PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1795,7 +1795,7 @@ class spell_item_reindeer_transformation : public SpellScriptLoader
 
         class spell_item_reindeer_transformation_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_reindeer_transformation_SpellScript);
+            PrepareSpellScript(spell_item_reindeer_transformation_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1860,7 +1860,7 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader
 
         class spell_item_nigh_invulnerability_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_nigh_invulnerability_SpellScript);
+            PrepareSpellScript(spell_item_nigh_invulnerability_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1906,7 +1906,7 @@ class spell_item_poultryizer : public SpellScriptLoader
 
         class spell_item_poultryizer_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_poultryizer_SpellScript);
+            PrepareSpellScript(spell_item_poultryizer_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1946,7 +1946,7 @@ class spell_item_socrethars_stone : public SpellScriptLoader
 
         class spell_item_socrethars_stone_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_socrethars_stone_SpellScript);
+            PrepareSpellScript(spell_item_socrethars_stone_SpellScript)
 
             bool Load() override
             {
@@ -2001,7 +2001,7 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader
 
         class spell_item_demon_broiled_surprise_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_demon_broiled_surprise_SpellScript);
+            PrepareSpellScript(spell_item_demon_broiled_surprise_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2058,7 +2058,7 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader
 
         class spell_item_complete_raptor_capture_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_complete_raptor_capture_SpellScript);
+            PrepareSpellScript(spell_item_complete_raptor_capture_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2104,7 +2104,7 @@ class spell_item_impale_leviroth : public SpellScriptLoader
 
         class spell_item_impale_leviroth_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_impale_leviroth_SpellScript);
+            PrepareSpellScript(spell_item_impale_leviroth_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2149,7 +2149,7 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader
 
         class spell_item_brewfest_mount_transformation_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_brewfest_mount_transformation_SpellScript);
+            PrepareSpellScript(spell_item_brewfest_mount_transformation_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2212,7 +2212,7 @@ class spell_item_nitro_boots : public SpellScriptLoader
 
         class spell_item_nitro_boots_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_nitro_boots_SpellScript);
+            PrepareSpellScript(spell_item_nitro_boots_SpellScript)
 
             bool Load() override
             {
@@ -2259,7 +2259,7 @@ class spell_item_teach_language : public SpellScriptLoader
 
         class spell_item_teach_language_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_teach_language_SpellScript);
+            PrepareSpellScript(spell_item_teach_language_SpellScript)
 
             bool Load() override
             {
@@ -2305,7 +2305,7 @@ class spell_item_rocket_boots : public SpellScriptLoader
 
         class spell_item_rocket_boots_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_rocket_boots_SpellScript);
+            PrepareSpellScript(spell_item_rocket_boots_SpellScript)
 
             bool Load() override
             {
@@ -2362,7 +2362,7 @@ class spell_item_pygmy_oil : public SpellScriptLoader
 
         class spell_item_pygmy_oil_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_pygmy_oil_SpellScript);
+            PrepareSpellScript(spell_item_pygmy_oil_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2408,7 +2408,7 @@ class spell_item_unusual_compass : public SpellScriptLoader
 
         class spell_item_unusual_compass_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_unusual_compass_SpellScript);
+            PrepareSpellScript(spell_item_unusual_compass_SpellScript)
 
             void HandleDummy(SpellEffIndex /* effIndex */)
             {
@@ -2443,7 +2443,7 @@ class spell_item_chicken_cover : public SpellScriptLoader
 
         class spell_item_chicken_cover_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_chicken_cover_SpellScript);
+            PrepareSpellScript(spell_item_chicken_cover_SpellScript)
 
             bool Load() override
             {
@@ -2496,7 +2496,7 @@ class spell_item_refocus : public SpellScriptLoader
 
         class spell_item_refocus_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_refocus_SpellScript);
+            PrepareSpellScript(spell_item_refocus_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -2534,7 +2534,7 @@ class spell_item_muisek_vessel : public SpellScriptLoader
 
         class spell_item_muisek_vessel_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_item_muisek_vessel_SpellScript);
+            PrepareSpellScript(spell_item_muisek_vessel_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -2566,7 +2566,7 @@ public:
 
     class spell_item_greatmothers_soulcatcher_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_item_greatmothers_soulcatcher_SpellScript);
+        PrepareSpellScript(spell_item_greatmothers_soulcatcher_SpellScript)
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index edb9cd04b44..1f41c7974cd 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -82,7 +82,7 @@ class spell_mage_blast_wave : public SpellScriptLoader
 
         class spell_mage_blast_wave_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mage_blast_wave_SpellScript);
+            PrepareSpellScript(spell_mage_blast_wave_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -117,7 +117,7 @@ class spell_mage_burnout : public SpellScriptLoader
 
         class spell_mage_burnout_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mage_burnout_AuraScript);
+            PrepareAuraScript(spell_mage_burnout_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -162,7 +162,7 @@ class spell_mage_cold_snap : public SpellScriptLoader
 
         class spell_mage_cold_snap_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mage_cold_snap_SpellScript);
+            PrepareSpellScript(spell_mage_cold_snap_SpellScript)
 
             bool Load() override
             {
@@ -210,7 +210,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader
 
         class spell_mage_fire_frost_ward_AuraScript : public spell_mage_incanters_absorbtion_base_AuraScript
         {
-            PrepareAuraScript(spell_mage_fire_frost_ward_AuraScript);
+            PrepareAuraScript(spell_mage_fire_frost_ward_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -276,7 +276,7 @@ class spell_mage_focus_magic : public SpellScriptLoader
 
         class spell_mage_focus_magic_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mage_focus_magic_AuraScript);
+            PrepareAuraScript(spell_mage_focus_magic_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -327,7 +327,7 @@ class spell_mage_ice_barrier : public SpellScriptLoader
 
         class spell_mage_ice_barrier_AuraScript : public spell_mage_incanters_absorbtion_base_AuraScript
         {
-            PrepareAuraScript(spell_mage_ice_barrier_AuraScript);
+            PrepareAuraScript(spell_mage_ice_barrier_AuraScript)
 
             void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
             {
@@ -370,7 +370,7 @@ class spell_mage_ignite : public SpellScriptLoader
 
         class spell_mage_ignite_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mage_ignite_AuraScript);
+            PrepareAuraScript(spell_mage_ignite_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -417,7 +417,7 @@ class spell_mage_living_bomb : public SpellScriptLoader
 
         class spell_mage_living_bomb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mage_living_bomb_AuraScript);
+            PrepareAuraScript(spell_mage_living_bomb_AuraScript)
 
             bool Validate(SpellInfo const* spell) override
             {
@@ -456,7 +456,7 @@ class spell_mage_mana_shield : public SpellScriptLoader
 
         class spell_mage_mana_shield_AuraScript : public spell_mage_incanters_absorbtion_base_AuraScript
         {
-            PrepareAuraScript(spell_mage_mana_shield_AuraScript);
+            PrepareAuraScript(spell_mage_mana_shield_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
             {
@@ -494,7 +494,7 @@ class spell_mage_master_of_elements : public SpellScriptLoader
 
         class spell_mage_master_of_elements_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mage_master_of_elements_AuraScript);
+            PrepareAuraScript(spell_mage_master_of_elements_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -546,7 +546,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader
 
         class spell_mage_polymorph_cast_visual_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mage_polymorph_cast_visual_SpellScript);
+            PrepareSpellScript(spell_mage_polymorph_cast_visual_SpellScript)
 
             static const uint32 PolymorhForms[6];
 
@@ -596,7 +596,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader
 
         class spell_mage_summon_water_elemental_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mage_summon_water_elemental_SpellScript);
+            PrepareSpellScript(spell_mage_summon_water_elemental_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index bf4f1b77a19..753d521c652 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -97,7 +97,7 @@ class spell_pal_ardent_defender : public SpellScriptLoader
 
         class spell_pal_ardent_defender_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_ardent_defender_AuraScript);
+            PrepareAuraScript(spell_pal_ardent_defender_AuraScript)
 
             uint32 absorbPct, healPct;
 
@@ -173,7 +173,7 @@ class spell_pal_aura_mastery : public SpellScriptLoader
 
         class spell_pal_aura_mastery_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_aura_mastery_AuraScript);
+            PrepareAuraScript(spell_pal_aura_mastery_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -213,7 +213,7 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader
 
         class spell_pal_aura_mastery_immune_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_aura_mastery_immune_AuraScript);
+            PrepareAuraScript(spell_pal_aura_mastery_immune_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -247,7 +247,7 @@ class spell_pal_avenging_wrath : public SpellScriptLoader
 
         class spell_pal_avenging_wrath_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_avenging_wrath_AuraScript);
+            PrepareAuraScript(spell_pal_avenging_wrath_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -293,7 +293,7 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader
 
         class spell_pal_blessing_of_faith_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript);
+            PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -350,7 +350,7 @@ class spell_pal_blessing_of_sanctuary : public SpellScriptLoader
 
         class spell_pal_blessing_of_sanctuary_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_blessing_of_sanctuary_AuraScript);
+            PrepareAuraScript(spell_pal_blessing_of_sanctuary_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -408,7 +408,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader
 
         class spell_pal_divine_sacrifice_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_divine_sacrifice_AuraScript);
+            PrepareAuraScript(spell_pal_divine_sacrifice_AuraScript)
 
             uint32 groupSize, minHpPct;
             int32 remainingAmount;
@@ -463,7 +463,7 @@ class spell_pal_divine_storm : public SpellScriptLoader
 
         class spell_pal_divine_storm_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_divine_storm_SpellScript);
+            PrepareSpellScript(spell_pal_divine_storm_SpellScript)
 
             uint32 healPct;
 
@@ -506,7 +506,7 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader
 
         class spell_pal_divine_storm_dummy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript);
+            PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -552,7 +552,7 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader
 
         class spell_pal_exorcism_and_holy_wrath_damage_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_exorcism_and_holy_wrath_damage_AuraScript);
+            PrepareAuraScript(spell_pal_exorcism_and_holy_wrath_damage_AuraScript)
 
             void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
             {
@@ -588,7 +588,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader
 
         class spell_pal_eye_for_an_eye_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_eye_for_an_eye_AuraScript);
+            PrepareAuraScript(spell_pal_eye_for_an_eye_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -625,7 +625,7 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader
 
         class spell_pal_glyph_of_holy_light_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_glyph_of_holy_light_SpellScript);
+            PrepareSpellScript(spell_pal_glyph_of_holy_light_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -658,7 +658,7 @@ class spell_pal_guarded_by_the_light : public SpellScriptLoader
 
         class spell_pal_guarded_by_the_light_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_guarded_by_the_light_SpellScript);
+            PrepareSpellScript(spell_pal_guarded_by_the_light_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -694,7 +694,7 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader
 
         class spell_pal_hand_of_sacrifice_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_hand_of_sacrifice_AuraScript);
+            PrepareAuraScript(spell_pal_hand_of_sacrifice_AuraScript)
 
             int32 remainingAmount;
 
@@ -738,7 +738,7 @@ class spell_pal_hand_of_salvation : public SpellScriptLoader
 
         class spell_pal_hand_of_salvation_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_hand_of_salvation_AuraScript);
+            PrepareAuraScript(spell_pal_hand_of_salvation_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -771,7 +771,7 @@ class spell_pal_holy_shock : public SpellScriptLoader
 
         class spell_pal_holy_shock_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_holy_shock_SpellScript);
+            PrepareSpellScript(spell_pal_holy_shock_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -849,7 +849,7 @@ class spell_pal_improved_aura : public SpellScriptLoader
 
         class spell_pal_improved_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_improved_aura_AuraScript);
+            PrepareAuraScript(spell_pal_improved_aura_AuraScript)
 
         public:
             spell_pal_improved_aura_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { }
@@ -910,7 +910,7 @@ class spell_pal_improved_aura_effect : public SpellScriptLoader
 
         class spell_pal_improved_aura_effect_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_improved_aura_effect_AuraScript);
+            PrepareAuraScript(spell_pal_improved_aura_effect_AuraScript)
 
             bool CheckAreaTarget(Unit* target)
             {
@@ -950,7 +950,7 @@ class spell_pal_item_healing_discount : public SpellScriptLoader
 
         class spell_pal_item_healing_discount_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_item_healing_discount_AuraScript);
+            PrepareAuraScript(spell_pal_item_healing_discount_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -987,7 +987,7 @@ class spell_pal_judgement : public SpellScriptLoader
 
         class spell_pal_judgement_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_judgement_SpellScript);
+            PrepareSpellScript(spell_pal_judgement_SpellScript)
 
         public:
             spell_pal_judgement_SpellScript(uint32 spellId) : SpellScript(), _spellId(spellId) { }
@@ -1046,7 +1046,7 @@ class spell_pal_judgement_of_command : public SpellScriptLoader
 
         class spell_pal_judgement_of_command_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_judgement_of_command_SpellScript);
+            PrepareSpellScript(spell_pal_judgement_of_command_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -1075,7 +1075,7 @@ class spell_pal_lay_on_hands : public SpellScriptLoader
 
         class spell_pal_lay_on_hands_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_lay_on_hands_SpellScript);
+            PrepareSpellScript(spell_pal_lay_on_hands_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1131,7 +1131,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader
 
         class spell_pal_righteous_defense_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pal_righteous_defense_SpellScript);
+            PrepareSpellScript(spell_pal_righteous_defense_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1195,7 +1195,7 @@ class spell_pal_sacred_shield : public SpellScriptLoader
 
         class spell_pal_sacred_shield_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_sacred_shield_AuraScript);
+            PrepareAuraScript(spell_pal_sacred_shield_AuraScript)
 
             void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -1239,7 +1239,7 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader
 
         class spell_pal_seal_of_righteousness_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pal_seal_of_righteousness_AuraScript);
+            PrepareAuraScript(spell_pal_seal_of_righteousness_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp
index 775f9f505f9..6eabf61b053 100644
--- a/src/server/scripts/Spells/spell_pet.cpp
+++ b/src/server/scripts/Spells/spell_pet.cpp
@@ -93,7 +93,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader
 
         class spell_gen_pet_calculate_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_gen_pet_calculate_AuraScript);
+            PrepareAuraScript(spell_gen_pet_calculate_AuraScript)
 
             bool Load() override
             {
@@ -227,7 +227,7 @@ public:
 
     class spell_warl_pet_scaling_01_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_scaling_01_AuraScript);
+        PrepareAuraScript(spell_warl_pet_scaling_01_AuraScript)
 
         bool Load() override
         {
@@ -364,7 +364,7 @@ public:
 
     class spell_warl_pet_scaling_02_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_scaling_02_AuraScript);
+        PrepareAuraScript(spell_warl_pet_scaling_02_AuraScript)
 
         bool Load() override
         {
@@ -477,7 +477,7 @@ public:
 
     class spell_warl_pet_scaling_03_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_scaling_03_AuraScript);
+        PrepareAuraScript(spell_warl_pet_scaling_03_AuraScript)
 
         bool Load() override
         {
@@ -544,7 +544,7 @@ public:
 
     class spell_warl_pet_scaling_04_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_scaling_04_AuraScript);
+        PrepareAuraScript(spell_warl_pet_scaling_04_AuraScript)
 
         bool Load() override
         {
@@ -584,7 +584,7 @@ public:
 
     class spell_warl_pet_scaling_05_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_scaling_05_AuraScript);
+        PrepareAuraScript(spell_warl_pet_scaling_05_AuraScript)
 
         bool Load() override
         {
@@ -659,7 +659,7 @@ public:
 
     class spell_warl_pet_passive_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_passive_AuraScript);
+        PrepareAuraScript(spell_warl_pet_passive_AuraScript)
 
         bool Load() override
         {
@@ -732,7 +732,7 @@ public:
 
     class spell_warl_pet_passive_damage_done_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_passive_damage_done_AuraScript);
+        PrepareAuraScript(spell_warl_pet_passive_damage_done_AuraScript)
 
         bool Load() override
         {
@@ -783,7 +783,7 @@ public:
 
     class spell_warl_pet_passive_voidwalker_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_pet_passive_voidwalker_AuraScript);
+        PrepareAuraScript(spell_warl_pet_passive_voidwalker_AuraScript)
 
         bool Load() override
         {
@@ -821,7 +821,7 @@ public:
 
     class spell_sha_pet_scaling_04_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript);
+        PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript)
 
         bool Load() override
         {
@@ -880,7 +880,7 @@ public:
 
     class spell_hun_pet_scaling_01_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_hun_pet_scaling_01_AuraScript);
+        PrepareAuraScript(spell_hun_pet_scaling_01_AuraScript)
 
         void CalculateStaminaAmount(AuraEffect const* /* aurEff */, int32& amount, bool& /*canBeRecalculated*/)
         {
@@ -1006,7 +1006,7 @@ public:
 
     class spell_hun_pet_scaling_02_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_hun_pet_scaling_02_AuraScript);
+        PrepareAuraScript(spell_hun_pet_scaling_02_AuraScript)
 
         bool Load() override
         {
@@ -1093,7 +1093,7 @@ public:
 
     class spell_hun_pet_scaling_03_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_hun_pet_scaling_03_AuraScript);
+        PrepareAuraScript(spell_hun_pet_scaling_03_AuraScript)
 
         bool Load() override
         {
@@ -1180,7 +1180,7 @@ public:
 
     class spell_hun_pet_scaling_04_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_hun_pet_scaling_04_AuraScript);
+        PrepareAuraScript(spell_hun_pet_scaling_04_AuraScript)
 
         bool Load() override
         {
@@ -1261,7 +1261,7 @@ public:
 
     class spell_hun_pet_passive_crit_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_hun_pet_passive_crit_AuraScript);
+        PrepareAuraScript(spell_hun_pet_passive_crit_AuraScript)
 
         bool Load() override
         {
@@ -1332,7 +1332,7 @@ public:
 
     class spell_hun_pet_passive_damage_done_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_hun_pet_passive_damage_done_AuraScript);
+        PrepareAuraScript(spell_hun_pet_passive_damage_done_AuraScript)
 
         bool Load() override
         {
@@ -1390,7 +1390,7 @@ public:
 
     class spell_hun_animal_handler_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_hun_animal_handler_AuraScript);
+        PrepareAuraScript(spell_hun_animal_handler_AuraScript)
 
         bool Load() override
         {
@@ -1432,7 +1432,7 @@ public:
 
     class spell_dk_avoidance_passive_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_dk_avoidance_passive_AuraScript);
+        PrepareAuraScript(spell_dk_avoidance_passive_AuraScript)
 
         bool Load() override
         {
@@ -1476,7 +1476,7 @@ public:
 
     class spell_dk_pet_scaling_01_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript);
+        PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript)
 
         bool Load() override
         {
@@ -1579,7 +1579,7 @@ public:
 
     class spell_dk_pet_scaling_02_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_dk_pet_scaling_02_AuraScript);
+        PrepareAuraScript(spell_dk_pet_scaling_02_AuraScript)
 
         bool Load() override
         {
@@ -1622,7 +1622,7 @@ public:
 
     class spell_dk_pet_scaling_03_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_dk_pet_scaling_03_AuraScript);
+        PrepareAuraScript(spell_dk_pet_scaling_03_AuraScript)
 
         bool Load() override
         {
@@ -1685,7 +1685,7 @@ public:
 
     class spell_dk_rune_weapon_scaling_02_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_dk_rune_weapon_scaling_02_AuraScript);
+        PrepareAuraScript(spell_dk_rune_weapon_scaling_02_AuraScript)
 
         bool Load() override
         {
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index f96a30c903a..3345a4a6eef 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -96,7 +96,7 @@ class spell_pri_circle_of_healing : public SpellScriptLoader
 
         class spell_pri_circle_of_healing_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_circle_of_healing_SpellScript);
+            PrepareSpellScript(spell_pri_circle_of_healing_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -138,7 +138,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader
 
         class spell_pri_divine_aegis_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_divine_aegis_AuraScript);
+            PrepareAuraScript(spell_pri_divine_aegis_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -188,7 +188,7 @@ class spell_pri_divine_hymn : public SpellScriptLoader
 
         class spell_pri_divine_hymn_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_divine_hymn_SpellScript);
+            PrepareSpellScript(spell_pri_divine_hymn_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -223,7 +223,7 @@ class spell_pri_glyph_of_prayer_of_healing : public SpellScriptLoader
 
         class spell_pri_glyph_of_prayer_of_healing_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_glyph_of_prayer_of_healing_AuraScript);
+            PrepareAuraScript(spell_pri_glyph_of_prayer_of_healing_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -261,7 +261,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader
 
         class spell_pri_guardian_spirit_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_guardian_spirit_AuraScript);
+            PrepareAuraScript(spell_pri_guardian_spirit_AuraScript)
 
             uint32 healPct;
 
@@ -318,7 +318,7 @@ class spell_pri_hymn_of_hope : public SpellScriptLoader
 
         class spell_pri_hymn_of_hope_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_hymn_of_hope_SpellScript);
+            PrepareSpellScript(spell_pri_hymn_of_hope_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -354,7 +354,7 @@ class spell_pri_item_greater_heal_refund : public SpellScriptLoader
 
         class spell_pri_item_greater_heal_refund_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_item_greater_heal_refund_AuraScript);
+            PrepareAuraScript(spell_pri_item_greater_heal_refund_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -389,7 +389,7 @@ class spell_pri_lightwell_renew : public SpellScriptLoader
 
         class spell_pri_lightwell_renew_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_lightwell_renew_AuraScript);
+            PrepareAuraScript(spell_pri_lightwell_renew_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
             {
@@ -421,7 +421,7 @@ class spell_pri_mana_burn : public SpellScriptLoader
 
         class spell_pri_mana_burn_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_mana_burn_SpellScript);
+            PrepareSpellScript(spell_pri_mana_burn_SpellScript)
 
             void HandleAfterHit()
             {
@@ -449,7 +449,7 @@ class spell_pri_mana_leech : public SpellScriptLoader
 
         class spell_pri_mana_leech_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_mana_leech_AuraScript);
+            PrepareAuraScript(spell_pri_mana_leech_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -500,7 +500,7 @@ class spell_pri_mind_sear : public SpellScriptLoader
 
         class spell_pri_mind_sear_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_mind_sear_SpellScript);
+            PrepareSpellScript(spell_pri_mind_sear_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -527,7 +527,7 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader
 
         class spell_pri_pain_and_suffering_proc_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_pain_and_suffering_proc_SpellScript);
+            PrepareSpellScript(spell_pri_pain_and_suffering_proc_SpellScript)
 
             void HandleEffectScriptEffect(SpellEffIndex /*effIndex*/)
             {
@@ -557,7 +557,7 @@ class spell_pri_penance : public SpellScriptLoader
 
         class spell_pri_penance_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_penance_SpellScript);
+            PrepareSpellScript(spell_pri_penance_SpellScript)
 
             bool Load() override
             {
@@ -630,7 +630,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader
 
         class spell_pri_power_word_shield_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_power_word_shield_AuraScript);
+            PrepareAuraScript(spell_pri_power_word_shield_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -705,7 +705,7 @@ class spell_pri_prayer_of_mending_heal : public SpellScriptLoader
 
         class spell_pri_prayer_of_mending_heal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_prayer_of_mending_heal_SpellScript);
+            PrepareSpellScript(spell_pri_prayer_of_mending_heal_SpellScript)
 
             void HandleHeal(SpellEffIndex /*effIndex*/)
             {
@@ -740,7 +740,7 @@ class spell_pri_renew : public SpellScriptLoader
 
         class spell_pri_renew_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_renew_AuraScript);
+            PrepareAuraScript(spell_pri_renew_AuraScript)
 
             bool Load() override
             {
@@ -783,7 +783,7 @@ class spell_pri_shadow_word_death : public SpellScriptLoader
 
         class spell_pri_shadow_word_death_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pri_shadow_word_death_SpellScript);
+            PrepareSpellScript(spell_pri_shadow_word_death_SpellScript)
 
             void HandleDamage()
             {
@@ -816,7 +816,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader
 
         class spell_pri_vampiric_touch_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_pri_vampiric_touch_AuraScript);
+            PrepareAuraScript(spell_pri_vampiric_touch_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index f895381574e..76355a5f1fd 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -33,7 +33,7 @@
 
 class spell_generic_quest_update_entry_SpellScript : public SpellScript
 {
-    PrepareSpellScript(spell_generic_quest_update_entry_SpellScript);
+    PrepareSpellScript(spell_generic_quest_update_entry_SpellScript)
     private:
         uint16 _spellEffect;
         uint8 _effIndex;
@@ -99,7 +99,7 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader
 
         class spell_q2203_thaumaturgy_channel_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_q2203_thaumaturgy_channel_AuraScript);
+            PrepareAuraScript(spell_q2203_thaumaturgy_channel_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -142,7 +142,7 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader
 
         class spell_q5206_test_fetid_skull_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript);
+            PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript)
 
             bool Load() override
             {
@@ -194,7 +194,7 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader
 
         class spell_q6124_6129_apply_salve_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q6124_6129_apply_salve_SpellScript);
+            PrepareSpellScript(spell_q6124_6129_apply_salve_SpellScript)
 
             bool Load() override
             {
@@ -274,7 +274,7 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade
 
         class spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript);
+            PrepareAuraScript(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript)
 
             void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -310,7 +310,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader
 
         class spell_q11396_11399_scourging_crystal_controller_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript);
+            PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript)
 
             bool Validate(SpellInfo const* /*spellEntry*/) override
             {
@@ -348,7 +348,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript
 
         class spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript);
+            PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript)
 
             bool Validate(SpellInfo const* /*spellEntry*/) override
             {
@@ -411,7 +411,7 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader
 
         class spell_q11587_arcane_prisoner_rescue_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript);
+            PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript)
 
             bool Validate(SpellInfo const* /*spellEntry*/) override
             {
@@ -469,7 +469,7 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader
 
         class spell_q11730_ultrasonic_screwdriver_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript);
+            PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript)
 
             bool Load() override
             {
@@ -539,7 +539,7 @@ class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader
 
         class spell_q12459_seeds_of_natures_wrath_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12459_seeds_of_natures_wrath_SpellScript);
+            PrepareSpellScript(spell_q12459_seeds_of_natures_wrath_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -586,7 +586,7 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader
 
         class spell_q12634_despawn_fruit_tosser_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript);
+            PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript)
 
             bool Validate(SpellInfo const* /*spellEntry*/) override
             {
@@ -630,7 +630,7 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader
 
         class spell_q12683_take_sputum_sample_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12683_take_sputum_sample_SpellScript);
+            PrepareSpellScript(spell_q12683_take_sputum_sample_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -675,7 +675,7 @@ class spell_q12851_going_bearback : public SpellScriptLoader
 
         class spell_q12851_going_bearback_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_q12851_going_bearback_AuraScript);
+            PrepareAuraScript(spell_q12851_going_bearback_AuraScript)
 
             void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -733,7 +733,7 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader
 
         class spell_q12937_relief_for_the_fallen_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript);
+            PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript)
 
             bool Load() override
             {
@@ -784,7 +784,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader
 
         class spell_q10041_q10040_who_are_they_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript);
+            PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript)
 
             bool Validate(SpellInfo const* /*spellEntry*/) override
             {
@@ -828,7 +828,7 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader
 
         class spell_symbol_of_life_dummy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_symbol_of_life_dummy_SpellScript);
+            PrepareSpellScript(spell_symbol_of_life_dummy_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -871,7 +871,7 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader
 
         class spell_q12659_ahunaes_knife_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12659_ahunaes_knife_SpellScript);
+            PrepareSpellScript(spell_q12659_ahunaes_knife_SpellScript)
 
             bool Load() override
             {
@@ -915,7 +915,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader
 
         class spell_q9874_liquid_fire_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q9874_liquid_fire_SpellScript);
+            PrepareSpellScript(spell_q9874_liquid_fire_SpellScript)
 
             bool Load() override
             {
@@ -960,7 +960,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader
 
         class spell_q12805_lifeblood_dummy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12805_lifeblood_dummy_SpellScript);
+            PrepareSpellScript(spell_q12805_lifeblood_dummy_SpellScript)
 
             bool Load() override
             {
@@ -1008,7 +1008,7 @@ class spell_q13280_13283_plant_battle_standard: public SpellScriptLoader
 
         class spell_q13280_13283_plant_battle_standard_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q13280_13283_plant_battle_standard_SpellScript);
+            PrepareSpellScript(spell_q13280_13283_plant_battle_standard_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -1045,7 +1045,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader
 
         class spell_q14112_14145_chum_the_water_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q14112_14145_chum_the_water_SpellScript);
+            PrepareSpellScript(spell_q14112_14145_chum_the_water_SpellScript)
 
             bool Validate(SpellInfo const* /*spellEntry*/) override
             {
@@ -1087,7 +1087,7 @@ class spell_q9452_cast_net: public SpellScriptLoader
 
         class spell_q9452_cast_net_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q9452_cast_net_SpellScript);
+            PrepareSpellScript(spell_q9452_cast_net_SpellScript)
 
             bool Load() override
             {
@@ -1130,7 +1130,7 @@ public:
 
     class spell_q12987_read_pronouncement_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_q12987_read_pronouncement_AuraScript);
+        PrepareAuraScript(spell_q12987_read_pronouncement_AuraScript)
 
         void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
         {
@@ -1171,7 +1171,7 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader
 
         class spell_q12277_wintergarde_mine_explosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12277_wintergarde_mine_explosion_SpellScript);
+            PrepareSpellScript(spell_q12277_wintergarde_mine_explosion_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -1224,7 +1224,7 @@ public:
 
     class spell_q12066_bunny_kill_credit_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_q12066_bunny_kill_credit_SpellScript);
+        PrepareSpellScript(spell_q12066_bunny_kill_credit_SpellScript)
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
@@ -1262,7 +1262,7 @@ class spell_q12735_song_of_cleansing : public SpellScriptLoader
 
         class spell_q12735_song_of_cleansing_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12735_song_of_cleansing_SpellScript);
+            PrepareSpellScript(spell_q12735_song_of_cleansing_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1307,7 +1307,7 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader
 
         class spell_q12372_cast_from_gossip_trigger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12372_cast_from_gossip_trigger_SpellScript);
+            PrepareSpellScript(spell_q12372_cast_from_gossip_trigger_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1343,7 +1343,7 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad
 
         class spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript);
+            PrepareSpellScript(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -1375,7 +1375,7 @@ class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader
 
         class spell_q12372_azure_on_death_force_whisper_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12372_azure_on_death_force_whisper_SpellScript);
+            PrepareSpellScript(spell_q12372_azure_on_death_force_whisper_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -1414,7 +1414,7 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader
 
         class spell_q11010_q11102_q11023_aggro_check_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript);
+            PrepareAuraScript(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript)
 
             void HandleTriggerSpell(AuraEffect const* /*aurEff*/)
             {
@@ -1443,7 +1443,7 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader
 
         class spell_q11010_q11102_q11023_aggro_check_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q11010_q11102_q11023_aggro_check_SpellScript);
+            PrepareSpellScript(spell_q11010_q11102_q11023_aggro_check_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -1473,7 +1473,7 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader
 
         class spell_q11010_q11102_q11023_aggro_burst_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_q11010_q11102_q11023_aggro_burst_AuraScript);
+            PrepareAuraScript(spell_q11010_q11102_q11023_aggro_burst_AuraScript)
 
             void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
             {
@@ -1502,7 +1502,7 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader
 
         class spell_q11010_q11102_q11023_choose_loc_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q11010_q11102_q11023_choose_loc_SpellScript);
+            PrepareSpellScript(spell_q11010_q11102_q11023_choose_loc_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -1540,7 +1540,7 @@ class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScriptLoad
 
         class spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript);
+            PrepareSpellScript(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript)
 
             SpellCastResult CheckRequirement()
             {
@@ -1575,7 +1575,7 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader
 
         class spell_q12527_zuldrak_rat_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12527_zuldrak_rat_SpellScript);
+            PrepareSpellScript(spell_q12527_zuldrak_rat_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1614,7 +1614,7 @@ class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScrip
 
         class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript);
+            PrepareSpellScript(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript)
 
             void SetDest(SpellDestination& dest)
             {
@@ -1647,7 +1647,7 @@ class spell_q12730_quenching_mist : public SpellScriptLoader
 
         class spell_q12730_quenching_mist_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_q12730_quenching_mist_AuraScript);
+            PrepareAuraScript(spell_q12730_quenching_mist_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1690,7 +1690,7 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public
 
         class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript);
+            PrepareSpellScript(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -1729,7 +1729,7 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S
 
         class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript);
+            PrepareSpellScript(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript)
 
             void SetDest(SpellDestination& dest)
             {
@@ -1758,7 +1758,7 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader
 
         class spell_q12847_summon_soul_moveto_bunny_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12847_summon_soul_moveto_bunny_SpellScript);
+            PrepareSpellScript(spell_q12847_summon_soul_moveto_bunny_SpellScript)
 
             void SetDest(SpellDestination& dest)
             {
@@ -1793,7 +1793,7 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader
 
         class spell_q13011_bear_flank_master_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q13011_bear_flank_master_SpellScript);
+            PrepareSpellScript(spell_q13011_bear_flank_master_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1843,7 +1843,7 @@ class spell_q13086_cannons_target : public SpellScriptLoader
 
         class spell_q13086_cannons_target_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q13086_cannons_target_SpellScript);
+            PrepareSpellScript(spell_q13086_cannons_target_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -1894,7 +1894,7 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader
 
         class spell_q12690_burst_at_the_seams_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12690_burst_at_the_seams_SpellScript);
+            PrepareSpellScript(spell_q12690_burst_at_the_seams_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -1970,7 +1970,7 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader
 
         class spell_q12308_escape_from_silverbrook_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12308_escape_from_silverbrook_SpellScript);
+            PrepareSpellScript(spell_q12308_escape_from_silverbrook_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2004,7 +2004,7 @@ class spell_q12308_escape_from_silverbrook_summon_worgen : public SpellScriptLoa
 
         class spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript);
+            PrepareSpellScript(spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript)
 
             void ModDest(SpellDestination& dest)
             {
@@ -2049,7 +2049,7 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader
 
         class spell_q12641_death_comes_from_on_high_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12641_death_comes_from_on_high_SpellScript);
+            PrepareSpellScript(spell_q12641_death_comes_from_on_high_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2106,7 +2106,7 @@ class spell_q12619_emblazon_runeblade : public SpellScriptLoader
 
         class spell_q12619_emblazon_runeblade_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_q12619_emblazon_runeblade_AuraScript);
+            PrepareAuraScript(spell_q12619_emblazon_runeblade_AuraScript)
 
             void HandleEffectPeriodic(AuraEffect const* aurEff)
             {
@@ -2135,7 +2135,7 @@ class spell_q12619_emblazon_runeblade_effect : public SpellScriptLoader
 
         class spell_q12619_emblazon_runeblade_effect_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12619_emblazon_runeblade_effect_SpellScript);
+            PrepareSpellScript(spell_q12619_emblazon_runeblade_effect_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2167,7 +2167,7 @@ class spell_q12919_gymers_grab : public SpellScriptLoader
 
         class spell_q12919_gymers_grab_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q12919_gymers_grab_SpellScript);
+            PrepareSpellScript(spell_q12919_gymers_grab_SpellScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -2209,7 +2209,7 @@ class spell_q12919_gymers_throw : public SpellScriptLoader
 
         class spell_q12919_gymers_throw_SpellScript : public SpellScript
         {
-           PrepareSpellScript(spell_q12919_gymers_throw_SpellScript);
+           PrepareSpellScript(spell_q12919_gymers_throw_SpellScript)
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
@@ -2246,7 +2246,7 @@ class spell_q13400_illidan_kill_master : public SpellScriptLoader
 
         class spell_q13400_illidan_kill_master_SpellScript : public SpellScript
         {
-           PrepareSpellScript(spell_q13400_illidan_kill_master_SpellScript);
+           PrepareSpellScript(spell_q13400_illidan_kill_master_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -2288,7 +2288,7 @@ class spell_q14100_q14111_make_player_destroy_totems : public SpellScriptLoader
 
         class spell_q14100_q14111_make_player_destroy_totems_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_q14100_q14111_make_player_destroy_totems_SpellScript);
+            PrepareSpellScript(spell_q14100_q14111_make_player_destroy_totems_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index bf413aef6a3..16538484100 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -50,7 +50,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader
 
         class spell_rog_blade_flurry_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_blade_flurry_AuraScript);
+            PrepareAuraScript(spell_rog_blade_flurry_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -105,7 +105,7 @@ class spell_rog_cheat_death : public SpellScriptLoader
 
         class spell_rog_cheat_death_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_cheat_death_AuraScript);
+            PrepareAuraScript(spell_rog_cheat_death_AuraScript)
 
             uint32 absorbChance;
 
@@ -168,7 +168,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader
 
         class spell_rog_deadly_poison_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rog_deadly_poison_SpellScript);
+            PrepareSpellScript(spell_rog_deadly_poison_SpellScript)
 
             bool Load() override
             {
@@ -263,7 +263,7 @@ class spell_rog_killing_spree : public SpellScriptLoader
 
         class spell_rog_killing_spree_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rog_killing_spree_SpellScript);
+            PrepareSpellScript(spell_rog_killing_spree_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -294,7 +294,7 @@ class spell_rog_killing_spree : public SpellScriptLoader
 
         class spell_rog_killing_spree_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_killing_spree_AuraScript);
+            PrepareAuraScript(spell_rog_killing_spree_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -362,7 +362,7 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader
 
         class spell_rog_nerves_of_steel_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_nerves_of_steel_AuraScript);
+            PrepareAuraScript(spell_rog_nerves_of_steel_AuraScript)
 
             uint32 absorbPct;
 
@@ -406,7 +406,7 @@ class spell_rog_preparation : public SpellScriptLoader
 
         class spell_rog_preparation_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rog_preparation_SpellScript);
+            PrepareSpellScript(spell_rog_preparation_SpellScript)
 
             bool Load() override
             {
@@ -473,7 +473,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader
 
         class spell_rog_prey_on_the_weak_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript);
+            PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -518,7 +518,7 @@ class spell_rog_rupture : public SpellScriptLoader
 
         class spell_rog_rupture_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_rupture_AuraScript);
+            PrepareAuraScript(spell_rog_rupture_AuraScript)
 
             bool Load() override
             {
@@ -570,7 +570,7 @@ class spell_rog_shiv : public SpellScriptLoader
 
         class spell_rog_shiv_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_rog_shiv_SpellScript);
+            PrepareSpellScript(spell_rog_shiv_SpellScript)
 
             bool Load() override
             {
@@ -611,7 +611,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader
 
         class spell_rog_tricks_of_the_trade_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_tricks_of_the_trade_AuraScript);
+            PrepareAuraScript(spell_rog_tricks_of_the_trade_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -675,7 +675,7 @@ class spell_rog_tricks_of_the_trade_proc : public SpellScriptLoader
 
         class spell_rog_tricks_of_the_trade_proc_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_rog_tricks_of_the_trade_proc_AuraScript);
+            PrepareAuraScript(spell_rog_tricks_of_the_trade_proc_AuraScript)
 
             void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index 590cad7007f..1d1d8223a2a 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -70,7 +70,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader
 
         class spell_sha_ancestral_awakening_proc_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript);
+            PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -119,7 +119,7 @@ class spell_sha_astral_shift : public SpellScriptLoader
 
         class spell_sha_astral_shift_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_astral_shift_AuraScript);
+            PrepareAuraScript(spell_sha_astral_shift_AuraScript)
 
             uint32 absorbPct;
 
@@ -163,7 +163,7 @@ class spell_sha_bloodlust : public SpellScriptLoader
 
         class spell_sha_bloodlust_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_bloodlust_SpellScript);
+            PrepareSpellScript(spell_sha_bloodlust_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -206,7 +206,7 @@ class spell_sha_chain_heal : public SpellScriptLoader
 
         class spell_sha_chain_heal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_chain_heal_SpellScript);
+            PrepareSpellScript(spell_sha_chain_heal_SpellScript)
 
             bool Load() override
             {
@@ -256,7 +256,7 @@ class spell_sha_cleansing_totem_pulse : public SpellScriptLoader
 
         class spell_sha_cleansing_totem_pulse_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_cleansing_totem_pulse_SpellScript);
+            PrepareSpellScript(spell_sha_cleansing_totem_pulse_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -292,7 +292,7 @@ class spell_sha_earth_shield : public SpellScriptLoader
 
         class spell_sha_earth_shield_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_earth_shield_AuraScript);
+            PrepareAuraScript(spell_sha_earth_shield_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -360,7 +360,7 @@ class spell_sha_earthbind_totem : public SpellScriptLoader
 
         class spell_sha_earthbind_totem_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_earthbind_totem_AuraScript);
+            PrepareAuraScript(spell_sha_earthbind_totem_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -432,7 +432,7 @@ class spell_sha_earthen_power : public SpellScriptLoader
 
         class spell_sha_earthen_power_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_earthen_power_SpellScript);
+            PrepareSpellScript(spell_sha_earthen_power_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -459,7 +459,7 @@ class spell_sha_fire_nova : public SpellScriptLoader
 
         class spell_sha_fire_nova_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_fire_nova_SpellScript);
+            PrepareSpellScript(spell_sha_fire_nova_SpellScript)
 
             bool Validate(SpellInfo const* spellInfo) override
             {
@@ -517,7 +517,7 @@ class spell_sha_flame_shock : public SpellScriptLoader
 
         class spell_sha_flame_shock_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_flame_shock_AuraScript);
+            PrepareAuraScript(spell_sha_flame_shock_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -563,7 +563,7 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader
 
         class spell_sha_healing_stream_totem_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_healing_stream_totem_SpellScript);
+            PrepareSpellScript(spell_sha_healing_stream_totem_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -618,7 +618,7 @@ class spell_sha_heroism : public SpellScriptLoader
 
         class spell_sha_heroism_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_heroism_SpellScript);
+            PrepareSpellScript(spell_sha_heroism_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -661,7 +661,7 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader
 
         class spell_sha_item_lightning_shield_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_item_lightning_shield_AuraScript);
+            PrepareAuraScript(spell_sha_item_lightning_shield_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -696,7 +696,7 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader
 
         class spell_sha_item_lightning_shield_trigger_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_item_lightning_shield_trigger_AuraScript);
+            PrepareAuraScript(spell_sha_item_lightning_shield_trigger_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -731,7 +731,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader
 
         class spell_sha_item_mana_surge_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_item_mana_surge_AuraScript);
+            PrepareAuraScript(spell_sha_item_mana_surge_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -819,7 +819,7 @@ class spell_sha_mana_spring_totem : public SpellScriptLoader
 
         class spell_sha_mana_spring_totem_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_mana_spring_totem_SpellScript);
+            PrepareSpellScript(spell_sha_mana_spring_totem_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -858,7 +858,7 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader
 
         class spell_sha_mana_tide_totem_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_mana_tide_totem_SpellScript);
+            PrepareSpellScript(spell_sha_mana_tide_totem_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -906,7 +906,7 @@ class spell_sha_sentry_totem : public SpellScriptLoader
 
         class spell_sha_sentry_totem_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_sha_sentry_totem_AuraScript);
+            PrepareAuraScript(spell_sha_sentry_totem_AuraScript)
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
@@ -951,7 +951,7 @@ class spell_sha_thunderstorm : public SpellScriptLoader
 
         class spell_sha_thunderstorm_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_sha_thunderstorm_SpellScript);
+            PrepareSpellScript(spell_sha_thunderstorm_SpellScript)
 
             void HandleKnockBack(SpellEffIndex effIndex)
             {
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 18979d24ecb..20f9cd83cad 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -69,7 +69,7 @@ class spell_warl_banish : public SpellScriptLoader
 
         class spell_warl_banish_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_banish_SpellScript);
+            PrepareSpellScript(spell_warl_banish_SpellScript)
 
             bool Load() override
             {
@@ -121,7 +121,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader
 
         class spell_warl_create_healthstone_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_create_healthstone_SpellScript);
+            PrepareSpellScript(spell_warl_create_healthstone_SpellScript)
 
             static uint32 const iTypes[8][3];
 
@@ -204,7 +204,7 @@ class spell_warl_curse_of_doom : public SpellScriptLoader
 
         class spell_warl_curse_of_doom_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_curse_of_doom_AuraScript);
+            PrepareAuraScript(spell_warl_curse_of_doom_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -251,7 +251,7 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader
 
         class spell_warl_demonic_circle_summon_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_demonic_circle_summon_AuraScript);
+            PrepareAuraScript(spell_warl_demonic_circle_summon_AuraScript)
 
             void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode)
             {
@@ -303,7 +303,7 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader
 
         class spell_warl_demonic_circle_teleport_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_demonic_circle_teleport_AuraScript);
+            PrepareAuraScript(spell_warl_demonic_circle_teleport_AuraScript)
 
             void HandleTeleport(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -337,7 +337,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader
 
         class spell_warl_demonic_empowerment_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript);
+            PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -401,7 +401,7 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader
 
         class spell_warl_everlasting_affliction_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_everlasting_affliction_SpellScript);
+            PrepareSpellScript(spell_warl_everlasting_affliction_SpellScript)
 
             void HandleScriptEffect(SpellEffIndex /*effIndex*/)
             {
@@ -431,7 +431,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader
 
         class spell_warl_fel_synergy_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_fel_synergy_AuraScript);
+            PrepareAuraScript(spell_warl_fel_synergy_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -474,7 +474,7 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader
 
         class spell_warl_glyph_of_shadowflame_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_glyph_of_shadowflame_AuraScript);
+            PrepareAuraScript(spell_warl_glyph_of_shadowflame_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -509,7 +509,7 @@ class spell_warl_haunt : public SpellScriptLoader
 
         class spell_warl_haunt_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_haunt_SpellScript);
+            PrepareSpellScript(spell_warl_haunt_SpellScript)
 
             void HandleOnHit()
             {
@@ -526,7 +526,7 @@ class spell_warl_haunt : public SpellScriptLoader
 
         class spell_warl_haunt_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_haunt_AuraScript);
+            PrepareAuraScript(spell_warl_haunt_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -569,7 +569,7 @@ class spell_warl_health_funnel : public SpellScriptLoader
 
         class spell_warl_health_funnel_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_health_funnel_AuraScript);
+            PrepareAuraScript(spell_warl_health_funnel_AuraScript)
 
             void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
@@ -612,7 +612,7 @@ class spell_warl_life_tap : public SpellScriptLoader
 
         class spell_warl_life_tap_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_life_tap_SpellScript);
+            PrepareSpellScript(spell_warl_life_tap_SpellScript)
 
             bool Load() override
             {
@@ -684,7 +684,7 @@ class spell_warl_ritual_of_doom_effect : public SpellScriptLoader
 
         class spell_warl_ritual_of_doom_effect_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_ritual_of_doom_effect_SpellScript);
+            PrepareSpellScript(spell_warl_ritual_of_doom_effect_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -712,7 +712,7 @@ class spell_warl_seed_of_corruption : public SpellScriptLoader
 
         class spell_warl_seed_of_corruption_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_seed_of_corruption_SpellScript);
+            PrepareSpellScript(spell_warl_seed_of_corruption_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& targets)
             {
@@ -740,7 +740,7 @@ class spell_warl_shadow_ward : public SpellScriptLoader
 
         class spell_warl_shadow_ward_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_shadow_ward_AuraScript);
+            PrepareAuraScript(spell_warl_shadow_ward_AuraScript)
 
             void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
             {
@@ -777,7 +777,7 @@ class spell_warl_siphon_life : public SpellScriptLoader
 
         class spell_warl_siphon_life_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_siphon_life_AuraScript);
+            PrepareAuraScript(spell_warl_siphon_life_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -826,7 +826,7 @@ class spell_warl_soulshatter : public SpellScriptLoader
 
         class spell_warl_soulshatter_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warl_soulshatter_SpellScript);
+            PrepareSpellScript(spell_warl_soulshatter_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -865,7 +865,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader
 
         class spell_warl_unstable_affliction_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warl_unstable_affliction_AuraScript);
+            PrepareAuraScript(spell_warl_unstable_affliction_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index fd1c785cf50..8b49c1c9a6d 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -78,7 +78,7 @@ class spell_warr_bloodthirst : public SpellScriptLoader
 
         class spell_warr_bloodthirst_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_bloodthirst_SpellScript);
+            PrepareSpellScript(spell_warr_bloodthirst_SpellScript)
 
             void HandleDamage(SpellEffIndex /*effIndex*/)
             {
@@ -120,7 +120,7 @@ class spell_warr_bloodthirst_heal : public SpellScriptLoader
 
         class spell_warr_bloodthirst_heal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_bloodthirst_heal_SpellScript);
+            PrepareSpellScript(spell_warr_bloodthirst_heal_SpellScript)
 
             void HandleHeal(SpellEffIndex /*effIndex*/)
             {
@@ -148,7 +148,7 @@ class spell_warr_charge : public SpellScriptLoader
 
         class spell_warr_charge_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_charge_SpellScript);
+            PrepareSpellScript(spell_warr_charge_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -188,7 +188,7 @@ class spell_warr_concussion_blow : public SpellScriptLoader
 
         class spell_warr_concussion_blow_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_concussion_blow_SpellScript);
+            PrepareSpellScript(spell_warr_concussion_blow_SpellScript)
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
@@ -215,7 +215,7 @@ class spell_warr_damage_shield : public SpellScriptLoader
 
         class spell_warr_damage_shield_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warr_damage_shield_AuraScript);
+            PrepareAuraScript(spell_warr_damage_shield_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -253,7 +253,7 @@ class spell_warr_deep_wounds : public SpellScriptLoader
 
         class spell_warr_deep_wounds_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_deep_wounds_SpellScript);
+            PrepareSpellScript(spell_warr_deep_wounds_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -308,7 +308,7 @@ class spell_warr_execute : public SpellScriptLoader
 
         class spell_warr_execute_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_execute_SpellScript);
+            PrepareSpellScript(spell_warr_execute_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -364,7 +364,7 @@ class spell_warr_glyph_of_sunder_armor : public SpellScriptLoader
 
         class spell_warr_glyph_of_sunder_armor_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warr_glyph_of_sunder_armor_AuraScript);
+            PrepareAuraScript(spell_warr_glyph_of_sunder_armor_AuraScript)
 
             void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
             {
@@ -400,7 +400,7 @@ class spell_warr_improved_spell_reflection : public SpellScriptLoader
 
         class spell_warr_improved_spell_reflection_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_improved_spell_reflection_SpellScript);
+            PrepareSpellScript(spell_warr_improved_spell_reflection_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -428,7 +428,7 @@ class spell_warr_intimidating_shout : public SpellScriptLoader
 
         class spell_warr_intimidating_shout_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_intimidating_shout_SpellScript);
+            PrepareSpellScript(spell_warr_intimidating_shout_SpellScript)
 
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
@@ -456,7 +456,7 @@ class spell_warr_last_stand : public SpellScriptLoader
 
         class spell_warr_last_stand_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_last_stand_SpellScript);
+            PrepareSpellScript(spell_warr_last_stand_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -492,7 +492,7 @@ class spell_warr_overpower : public SpellScriptLoader
 
         class spell_warr_overpower_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_overpower_SpellScript);
+            PrepareSpellScript(spell_warr_overpower_SpellScript)
 
             void HandleEffect(SpellEffIndex /*effIndex*/)
             {
@@ -530,7 +530,7 @@ class spell_warr_rend : public SpellScriptLoader
 
         class spell_warr_rend_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warr_rend_AuraScript);
+            PrepareAuraScript(spell_warr_rend_AuraScript)
 
             void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
             {
@@ -576,7 +576,7 @@ class spell_warr_retaliation : public SpellScriptLoader
 
         class spell_warr_retaliation_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warr_retaliation_AuraScript);
+            PrepareAuraScript(spell_warr_retaliation_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -618,7 +618,7 @@ class spell_warr_shattering_throw : public SpellScriptLoader
 
         class spell_warr_shattering_throw_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_shattering_throw_SpellScript);
+            PrepareSpellScript(spell_warr_shattering_throw_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {
@@ -649,7 +649,7 @@ class spell_warr_slam : public SpellScriptLoader
 
         class spell_warr_slam_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_slam_SpellScript);
+            PrepareSpellScript(spell_warr_slam_SpellScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -684,7 +684,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader
 
         class spell_warr_sweeping_strikes_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warr_sweeping_strikes_AuraScript);
+            PrepareAuraScript(spell_warr_sweeping_strikes_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -748,7 +748,7 @@ class spell_warr_vigilance : public SpellScriptLoader
 
         class spell_warr_vigilance_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_warr_vigilance_AuraScript);
+            PrepareAuraScript(spell_warr_vigilance_AuraScript)
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
@@ -842,7 +842,7 @@ class spell_warr_vigilance_trigger : public SpellScriptLoader
 
         class spell_warr_vigilance_trigger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_warr_vigilance_trigger_SpellScript);
+            PrepareSpellScript(spell_warr_vigilance_trigger_SpellScript)
 
             void HandleScript(SpellEffIndex effIndex)
             {