* Fix remaining errors in scripts project

* Remove now obsolete ScriptedInstance.h file

--HG--
branch : trunk

8 files changed, 95 insertions, 48 deletions

diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index e7e3d46955f..f551ca70d52 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -93,7 +93,8 @@ EndScriptData */
 #define OLUM_Z                     -7.54773f
 #define OLUM_O                     0.401581f
 
-//Fathom-Lord Karathress AI
class boss_fathomlord_karathress : public CreatureScript
+//Fathom-Lord Karathress AI
+class boss_fathomlord_karathress : public CreatureScript
 {
 public:
     boss_fathomlord_karathress() : CreatureScript("boss_fathomlord_karathress") { }
@@ -303,7 +304,8 @@ public:
 
 };
 
-//Fathom-Guard Sharkkis AI
class boss_fathomguard_sharkkis : public CreatureScript
+//Fathom-Guard Sharkkis AI
+class boss_fathomguard_sharkkis : public CreatureScript
 {
 public:
     boss_fathomguard_sharkkis() : CreatureScript("boss_fathomguard_sharkkis") { }
@@ -456,7 +458,8 @@ public:
 
 };
 
-//Fathom-Guard Tidalvess AI
class boss_fathomguard_tidalvess : public CreatureScript
+//Fathom-Guard Tidalvess AI
+class boss_fathomguard_tidalvess : public CreatureScript
 {
 public:
     boss_fathomguard_tidalvess() : CreatureScript("boss_fathomguard_tidalvess") { }
@@ -582,7 +585,8 @@ public:
 
 };
 
-//Fathom-Guard Caribdis AI
class boss_fathomguard_caribdis : public CreatureScript
+//Fathom-Guard Caribdis AI
+class boss_fathomguard_caribdis : public CreatureScript
 {
 public:
     boss_fathomguard_caribdis() : CreatureScript("boss_fathomguard_caribdis") { }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 96c3662631b..e81196d79c1 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -132,7 +132,8 @@ float ShieldGeneratorChannelPos[4][4] =
     {49.3126, -943.398, 42.5501, 2.40174}
 };
 
-//Lady Vashj AI
class boss_lady_vashj : public CreatureScript
+//Lady Vashj AI
+class boss_lady_vashj : public CreatureScript
 {
 public:
     boss_lady_vashj() : CreatureScript("boss_lady_vashj") { }
@@ -575,7 +576,8 @@ public:
 };
 
 //Enchanted Elemental
-//If one of them reaches Vashj he will increase her damage done by 5%.
class mob_enchanted_elemental : public CreatureScript
+//If one of them reaches Vashj he will increase her damage done by 5%.
+class mob_enchanted_elemental : public CreatureScript
 {
 public:
     mob_enchanted_elemental() : CreatureScript("mob_enchanted_elemental") { }
@@ -676,7 +678,8 @@ public:
 };
 
 //Tainted Elemental
-//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
class mob_tainted_elemental : public CreatureScript
+//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
+class mob_tainted_elemental : public CreatureScript
 {
 public:
     mob_tainted_elemental() : CreatureScript("mob_tainted_elemental") { }
@@ -750,7 +753,8 @@ public:
 };
 
 //Toxic Sporebat
-//Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it.
class mob_toxic_sporebat : public CreatureScript
+//Toxic Spores: Used in Phase 3 by the Spore Bats, it creates a contaminated green patch of ground, dealing about 2775-3225 nature damage every second to anyone who stands in it.
+class mob_toxic_sporebat : public CreatureScript
 {
 public:
     mob_toxic_sporebat() : CreatureScript("mob_toxic_sporebat") { }
@@ -857,7 +861,8 @@ public:
 };
 
 //Coilfang Elite
-//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage
class mob_coilfang_elite : public CreatureScript
+//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage
+class mob_coilfang_elite : public CreatureScript
 {
 public:
     mob_coilfang_elite() : CreatureScript("mob_coilfang_elite") { }
@@ -881,7 +886,8 @@ public:
 };
 
 //Coilfang Strider
-//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear.
class mob_coilfang_strider : public CreatureScript
+//It hits plate for about 8000 damage, has a Mind Blast spell doing about 3000 shadow damage, and a Psychic Scream Aura, which fears everybody in a 8 yard range of it every 2-3 seconds , for 5 seconds and increasing their movement speed by 150% during the fear.
+class mob_coilfang_strider : public CreatureScript
 {
 public:
     mob_coilfang_strider() : CreatureScript("mob_coilfang_strider") { }
@@ -905,7 +911,8 @@ public:
     }
 
 };
-
class mob_shield_generator_channel : public CreatureScript
+
+class mob_shield_generator_channel : public CreatureScript
 {
 public:
     mob_shield_generator_channel() : CreatureScript("mob_shield_generator_channel") { }
@@ -963,7 +970,8 @@ public:
     };
 
 };
-
class item_tainted_core : public ItemScript
+
+class item_tainted_core : public ItemScript
 {
 public:
     item_tainted_core() : ItemScript("item_tainted_core") { }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index 589127d3140..b8b167e6ced 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -66,7 +66,8 @@ EndScriptData */
 #define SAY_FINAL_FORM          -1548018
 #define SAY_FREE                -1548019
 #define SAY_DEATH               -1548020
-
class mob_inner_demon : public CreatureScript
+
+class mob_inner_demon : public CreatureScript
 {
 public:
     mob_inner_demon() : CreatureScript("mob_inner_demon") { }
@@ -156,7 +157,8 @@ public:
 
 };
 
-//Original Leotheras the Blind AI
class boss_leotheras_the_blind : public CreatureScript
+//Original Leotheras the Blind AI
+class boss_leotheras_the_blind : public CreatureScript
 {
 public:
     boss_leotheras_the_blind() : CreatureScript("boss_leotheras_the_blind") { }
@@ -581,7 +583,8 @@ public:
 
 };
 
-//Leotheras the Blind Demon Form AI
class boss_leotheras_the_blind_demonform : public CreatureScript
+//Leotheras the Blind Demon Form AI
+class boss_leotheras_the_blind_demonform : public CreatureScript
 {
 public:
     boss_leotheras_the_blind_demonform() : CreatureScript("boss_leotheras_the_blind_demonform") { }
@@ -651,9 +654,10 @@ public:
 
             //Do NOT deal any melee damage to the target.
         }
-    };
class mob_greyheart_spellbinder : public CreatureScript
-
+    };
 };
+
+class mob_greyheart_spellbinder : public CreatureScript
 {
 public:
     mob_greyheart_spellbinder() : CreatureScript("mob_greyheart_spellbinder") { }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index a6807ca69e6..607d9e027bb 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -97,7 +97,8 @@ float MurlocCords[10][5] =
 #define WATER_GLOBULE               21913
 #define TIDEWALKER_LURKER           21920
 
-//Morogrim Tidewalker AI
class boss_morogrim_tidewalker : public CreatureScript
+//Morogrim Tidewalker AI
+class boss_morogrim_tidewalker : public CreatureScript
 {
 public:
     boss_morogrim_tidewalker() : CreatureScript("boss_morogrim_tidewalker") { }
@@ -301,7 +302,8 @@ public:
 
 //Water Globule AI
 #define SPELL_GLOBULE_EXPLOSION 37871
-
class mob_water_globule : public CreatureScript
+
+class mob_water_globule : public CreatureScript
 {
 public:
     mob_water_globule() : CreatureScript("mob_water_globule") { }
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index a5a82e8cc86..84a2208b6f2 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -105,7 +105,8 @@ bool CheckAllBossDied(InstanceScript* pInstance, Creature* me)
     return false;
 }
 
-//High King Maulgar AI
class boss_high_king_maulgar : public CreatureScript
+//High King Maulgar AI
+class boss_high_king_maulgar : public CreatureScript
 {
 public:
     boss_high_king_maulgar() : CreatureScript("boss_high_king_maulgar") { }
@@ -303,7 +304,8 @@ public:
 
 };
 
-//Olm The Summoner AI
class boss_olm_the_summoner : public CreatureScript
+//Olm The Summoner AI
+class boss_olm_the_summoner : public CreatureScript
 {
 public:
     boss_olm_the_summoner() : CreatureScript("boss_olm_the_summoner") { }
@@ -430,7 +432,8 @@ public:
 
 };
 
-//Kiggler The Crazed AI
class boss_kiggler_the_crazed : public CreatureScript
+//Kiggler The Crazed AI
+class boss_kiggler_the_crazed : public CreatureScript
 {
 public:
     boss_kiggler_the_crazed() : CreatureScript("boss_kiggler_the_crazed") { }
@@ -551,7 +554,8 @@ public:
 
 };
 
-//Blindeye The Seer AI
class boss_blindeye_the_seer : public CreatureScript
+//Blindeye The Seer AI
+class boss_blindeye_the_seer : public CreatureScript
 {
 public:
     boss_blindeye_the_seer() : CreatureScript("boss_blindeye_the_seer") { }
@@ -660,7 +664,8 @@ public:
 
 };
 
-//Krosh Firehand AI
class boss_krosh_firehand : public CreatureScript
+//Krosh Firehand AI
+class boss_krosh_firehand : public CreatureScript
 {
 public:
     boss_krosh_firehand() : CreatureScript("boss_krosh_firehand") { }
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
index e760453f73c..2fc0b4f8938 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -47,7 +47,8 @@ bool     obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five;
 ## mobs_bladespire_ogre
 ######*/
 
-//TODO: add support for quest 10512 + Creature abilities
class mobs_bladespire_ogre : public CreatureScript
+//TODO: add support for quest 10512 + Creature abilities
+class mobs_bladespire_ogre : public CreatureScript
 {
 public:
     mobs_bladespire_ogre() : CreatureScript("mobs_bladespire_ogre") { }
@@ -98,7 +99,8 @@ enum eNetherdrake
     SPELL_MANA_BURN             = 38884,
     SPELL_INTANGIBLE_PRESENCE   = 36513
 };
-
class mobs_nether_drake : public CreatureScript
+
+class mobs_nether_drake : public CreatureScript
 {
 public:
     mobs_nether_drake() : CreatureScript("mobs_nether_drake") { }
@@ -263,7 +265,8 @@ enum eDaranelle
     SAY_SPELL_INFLUENCE     = -1000174,
     SPELL_LASHHAN_CHANNEL   = 36904
 };
-
class npc_daranelle : public CreatureScript
+
+class npc_daranelle : public CreatureScript
 {
 public:
     npc_daranelle() : CreatureScript("npc_daranelle") { }
@@ -305,7 +308,8 @@ public:
 ######*/
 
 #define GOSSIP_HELLO_ON "Overseer, I am here to negotiate on behalf of the Cenarion Expedition."
-
class npc_overseer_nuaar : public CreatureScript
+
+class npc_overseer_nuaar : public CreatureScript
 {
 public:
     npc_overseer_nuaar() : CreatureScript("npc_overseer_nuaar") { }
@@ -339,7 +343,8 @@ public:
 
 #define GOSSIP_HELLO_STE    "Yes... yes, it's me."
 #define GOSSIP_SELECT_STE   "Yes elder. Tell me more of the book."
-
class npc_saikkal_the_elder : public CreatureScript
+
+class npc_saikkal_the_elder : public CreatureScript
 {
 public:
     npc_saikkal_the_elder() : CreatureScript("npc_saikkal_the_elder") { }
@@ -376,7 +381,8 @@ public:
 /*######
 ## go_legion_obelisk
 ######*/
-
class go_legion_obelisk : public GameObjectScript
+
+class go_legion_obelisk : public GameObjectScript
 {
 public:
     go_legion_obelisk() : GameObjectScript("go_legion_obelisk") { }
@@ -433,7 +439,8 @@ enum eBloodmaul
     NPC_QUEST_CREDIT      = 21241,
     GO_KEG                = 184315
 };
-
class npc_bloodmaul_brutebane : public CreatureScript
+
+class npc_bloodmaul_brutebane : public CreatureScript
 {
 public:
     npc_bloodmaul_brutebane() : CreatureScript("npc_bloodmaul_brutebane") { }
@@ -470,7 +477,8 @@ public:
 /*######
 ## npc_ogre_brute
 ######*/
-
class npc_ogre_brute : public CreatureScript
+
+class npc_ogre_brute : public CreatureScript
 {
 public:
     npc_ogre_brute() : CreatureScript("npc_ogre_brute") { }
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index 660ae4453cb..72fd565dd55 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -41,7 +41,8 @@ EndContentData */
 /*######
 ## mob_shattered_rumbler - this should be done with ACID
 ######*/
-
class mob_shattered_rumbler : public CreatureScript
+
+class mob_shattered_rumbler : public CreatureScript
 {
 public:
     mob_shattered_rumbler() : CreatureScript("mob_shattered_rumbler") { }
@@ -100,7 +101,8 @@ public:
 #define GOSSIP_SL1 "Why are Boulderfist out this far? You know that this is Kurenai territory."
 #define GOSSIP_SL2 "And you think you can just eat anything you want? You're obviously trying to eat the Broken of Telaar."
 #define GOSSIP_SL3 "This means war, Lump! War I say!"
-
class mob_lump : public CreatureScript
+
+class mob_lump : public CreatureScript
 {
 public:
     mob_lump() : CreatureScript("mob_lump") { }
@@ -246,7 +248,8 @@ public:
 /*####
 # mob_sunspring_villager - should be done with ACID
 ####*/
-
class mob_sunspring_villager : public CreatureScript
+
+class mob_sunspring_villager : public CreatureScript
 {
 public:
     mob_sunspring_villager() : CreatureScript("mob_sunspring_villager") { }
@@ -294,7 +297,8 @@ public:
 #define GOSSIP_SATS4 "Forge camps?"
 #define GOSSIP_SATS5 "Ok."
 #define GOSSIP_SATS6 "[PH] Story done"
-
class npc_altruis_the_sufferer : public CreatureScript
+
+class npc_altruis_the_sufferer : public CreatureScript
 {
 public:
     npc_altruis_the_sufferer() : CreatureScript("npc_altruis_the_sufferer") { }
@@ -399,7 +403,8 @@ public:
 #define GOSSIP_SGG10 "It is my Warchief, Greatmother. The leader of my people. From my world. He ... He is the son of Durotan. He is your grandchild."
 #define GOSSIP_SGG11 "I will return to Azeroth at once, Greatmother."
 
-//all the textId's for the below is unknown, but i do believe the gossip item texts are proper.
class npc_greatmother_geyah : public CreatureScript
+//all the textId's for the below is unknown, but i do believe the gossip item texts are proper.
+class npc_greatmother_geyah : public CreatureScript
 {
 public:
     npc_greatmother_geyah() : CreatureScript("npc_greatmother_geyah") { }
@@ -502,7 +507,8 @@ public:
 #define GOSSIP_SLB5 "My people ask that you pull back your Boulderfist ogres and cease all attacks on our territories. In return, we will also pull back our forces."
 #define GOSSIP_SLB6 "We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people."
 #define GOSSIP_SLB7 "What do I need to do?"
-
class npc_lantresor_of_the_blade : public CreatureScript
+
+class npc_lantresor_of_the_blade : public CreatureScript
 {
 public:
     npc_lantresor_of_the_blade() : CreatureScript("npc_lantresor_of_the_blade") { }
@@ -595,7 +601,8 @@ enum eMagharCaptive
 
 static float m_afAmbushA[]= {-1568.805786, 8533.873047, 1.958};
 static float m_afAmbushB[]= {-1491.554321, 8506.483398, 1.248};
-
class npc_maghar_captive : public CreatureScript
+
+class npc_maghar_captive : public CreatureScript
 {
 public:
     npc_maghar_captive() : CreatureScript("npc_maghar_captive") { }
@@ -741,7 +748,8 @@ public:
 /*######
 ## npc_creditmarker_visist_with_ancestors
 ######*/
-
class npc_creditmarker_visit_with_ancestors : public CreatureScript
+
+class npc_creditmarker_visit_with_ancestors : public CreatureScript
 {
 public:
     npc_creditmarker_visit_with_ancestors() : CreatureScript("npc_creditmarker_visit_with_ancestors") { }
@@ -789,7 +797,8 @@ public:
 
 #define SPELL_SPARROWHAWK_NET 39810
 #define SPELL_ITEM_CAPTIVE_SPARROWHAWK 39812
-
class mob_sparrowhawk : public CreatureScript
+
+class mob_sparrowhawk : public CreatureScript
 {
 public:
     mob_sparrowhawk() : CreatureScript("mob_sparrowhawk") { }
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index a4648614614..b3dc48c40fa 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -60,7 +60,8 @@ EndContentData */
 #define SPELL_DISABLE_VISUAL    35031
 #define SPELL_INTERRUPT_1       35016                       //ACID mobs should cast this
 #define SPELL_INTERRUPT_2       35176                       //ACID mobs should cast this (Manaforge Ara-version)
-
class npc_manaforge_control_console : public CreatureScript
+
+class npc_manaforge_control_console : public CreatureScript
 {
 public:
     npc_manaforge_control_console() : CreatureScript("npc_manaforge_control_console") { }
@@ -296,7 +297,8 @@ public:
 ## go_manaforge_control_console
 ######*/
 
-//TODO: clean up this workaround when Trinity adds support to do it properly (with gossip selections instead of instant summon)
class go_manaforge_control_console : public GameObjectScript
+//TODO: clean up this workaround when Trinity adds support to do it properly (with gossip selections instead of instant summon)
+class go_manaforge_control_console : public GameObjectScript
 {
 public:
     go_manaforge_control_console() : GameObjectScript("go_manaforge_control_console") { }
@@ -373,7 +375,8 @@ const uint32 CreatureEntry[3] =
     19831,                                                // Dawnforge
     21504                                                 // Pathaleon
 };
-
class npc_commander_dawnforge : public CreatureScript
+
+class npc_commander_dawnforge : public CreatureScript
 {
 public:
     npc_commander_dawnforge() : CreatureScript("npc_commander_dawnforge") { }
@@ -625,7 +628,8 @@ public:
 
 };
 
-
class at_commander_dawnforge : public AreaTriggerScript
+
+class at_commander_dawnforge : public AreaTriggerScript
 {
 public:
     at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { }
@@ -661,7 +665,8 @@ public:
 
 #define QUEST_DIMENSIUS 10439
 #define QUEST_ON_NETHERY_WINGS 10438
-
class npc_professor_dabiri : public CreatureScript
+
+class npc_professor_dabiri : public CreatureScript
 {
 public:
     npc_professor_dabiri() : CreatureScript("npc_professor_dabiri") { }
@@ -719,7 +724,8 @@ public:
 #define SPELL_MANA_BURN                 13321
 #define SPELL_MATERIALIZE               34804
 #define SPELL_DE_MATERIALIZE            34814
-
class mob_phase_hunter : public CreatureScript
+
+class mob_phase_hunter : public CreatureScript
 {
 public:
     mob_phase_hunter() : CreatureScript("mob_phase_hunter") { }
@@ -848,7 +854,8 @@ public:
 #define SPAWN_SECOND    19881
 #define SAY_THADELL_1   -1000304
 #define SAY_THADELL_2   -1000305
-
class npc_bessy : public CreatureScript
+
+class npc_bessy : public CreatureScript
 {
 public:
     npc_bessy() : CreatureScript("npc_bessy") { }