* Fix remaining errors in scripts project

* Remove now obsolete ScriptedInstance.h file

--HG--
branch : trunk

5 files changed, 32 insertions, 17 deletions

diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp
index 22765ff8b13..9f03f29765a 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/ashenvale.cpp
@@ -300,6 +300,7 @@ static float m_fVorshaCoord[]={3633.056885, 1172.924072, -5.388};
 class npc_muglash : public CreatureScript
 {
     public:
+        npc_muglash() : CreatureScript("npc_muglash") { }
 
         struct npc_muglashAI : public npc_escortAI
         {
@@ -425,7 +426,7 @@ class npc_muglash : public CreatureScript
             }
         };
 
-        CreatureAI* GetAI(Creature* creature) const
+        CreatureAI* GetAI(Creature* pCreature) const
         {
             return new npc_muglashAI(pCreature);
         }
@@ -455,11 +456,11 @@ class go_naga_brazier : public GameObjectScript
         {
         }
 
-        bool GOHello_go_naga_brazier(Player* player, GameObject* go)
+        bool OnGossipHello(Player* player, GameObject* go)
         {
             if (Creature* creature = GetClosestCreatureWithEntry(go, NPC_MUGLASH, INTERACTION_DISTANCE*2))
             {
-                if (npc_muglash::npc_muglashAI* pEscortAI = CAST_AI(npc_muglashAI, creature->AI()))
+                if (npc_muglash::npc_muglashAI* pEscortAI = CAST_AI(npc_muglash::npc_muglashAI, creature->AI()))
                 {
                     DoScriptText(SAY_MUG_BRAZIER_WAIT, creature);
 
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 8ba4b2ed235..292a3a10f18 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -64,7 +64,8 @@ enum eKerlonian
     FACTION_KER_ESCORTEE        = 113
 };
 
-//TODO: make concept similar as "ringo" -escort. Find a way to run the scripted attacks, _if_ player are choosing road.
class npc_kerlonian : public CreatureScript
+//TODO: make concept similar as "ringo" -escort. Find a way to run the scripted attacks, _if_ player are choosing road.
+class npc_kerlonian : public CreatureScript
 {
 public:
     npc_kerlonian() : CreatureScript("npc_kerlonian") { }
@@ -204,7 +205,8 @@ enum eRemtravel
     NPC_GRAVEL_BONE             = 2159,
     NPC_GRAVEL_GEO              = 2160
 };
-
class npc_prospector_remtravel : public CreatureScript
+
+class npc_prospector_remtravel : public CreatureScript
 {
 public:
     npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") { }
@@ -327,7 +329,8 @@ enum eThreshwackonator
 };
 
 #define GOSSIP_ITEM_INSERT_KEY  "[PH] Insert key"
-
class npc_threshwackonator : public CreatureScript
+
+class npc_threshwackonator : public CreatureScript
 {
 public:
     npc_threshwackonator() : CreatureScript("npc_threshwackonator") { }
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index 827d2122621..9ef82d1c953 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -51,7 +51,8 @@ enum eHuskSpirit
     NPC_RISEN_SPIRIT                    = 23554,
     NPC_RESTLESS_APPARITION             = 23861
 };
-
class mobs_risen_husk_spirit : public CreatureScript
+
+class mobs_risen_husk_spirit : public CreatureScript
 {
 public:
     mobs_risen_husk_spirit() : CreatureScript("mobs_risen_husk_spirit") { }
@@ -126,7 +127,8 @@ enum eRestlessApparition
     SAY_RESTLESS_2      = -1000470,
     SAY_RESTLESS_3      = -1000471
 };
-
class npc_restless_apparition : public CreatureScript
+
+class npc_restless_apparition : public CreatureScript
 {
 public:
     npc_restless_apparition() : CreatureScript("npc_restless_apparition") { }
@@ -158,7 +160,8 @@ enum eAgitator
     QUEST_TRAITORS_AMONG_US = 11126,
     FACTION_THER_DESERTER   = 1883
 };
-
class npc_deserter_agitator : public CreatureScript
+
+class npc_deserter_agitator : public CreatureScript
 {
 public:
     npc_deserter_agitator() : CreatureScript("npc_deserter_agitator") { }
@@ -206,7 +209,8 @@ enum eLadyJaina
 };
 
 #define GOSSIP_ITEM_JAINA "I know this is rather silly but i have a young ward who is a bit shy and would like your autograph."
-
class npc_lady_jaina_proudmoore : public CreatureScript
+
+class npc_lady_jaina_proudmoore : public CreatureScript
 {
 public:
     npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { }
@@ -245,7 +249,8 @@ enum eNatPagle
 {
     QUEST_NATS_MEASURING_TAPE = 8227
 };
-
class npc_nat_pagle : public CreatureScript
+
+class npc_nat_pagle : public CreatureScript
 {
 public:
     npc_nat_pagle() : CreatureScript("npc_nat_pagle") { }
@@ -298,7 +303,8 @@ enum eHendel
     NPC_TERVOSH                 = 4967
 };
 
-//TODO: develop this further, end event not created
class npc_private_hendel : public CreatureScript
+//TODO: develop this further, end event not created
+class npc_private_hendel : public CreatureScript
 {
 public:
     npc_private_hendel() : CreatureScript("npc_private_hendel") { }
@@ -366,7 +372,8 @@ enum eZelfrax
     SAY_ZELFRAX     = -1000472,
     SAY_ZELFRAX_2   = -1000473
 };
-
class npc_zelfrax : public CreatureScript
+
+class npc_zelfrax : public CreatureScript
 {
 public:
     npc_zelfrax() : CreatureScript("npc_zelfrax") { }
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp
index e8ab1a6e241..f05f293f890 100644
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/orgrimmar.cpp
@@ -38,7 +38,8 @@ EndContentData */
 #define QUEST_5727  5727
 
 #define GOSSIP_HNF "You may speak frankly, Neeru..."
-#define GOSSIP_SNF "[PH] ..."
class npc_neeru_fireblade : public CreatureScript
+#define GOSSIP_SNF "[PH] ..."
+class npc_neeru_fireblade : public CreatureScript
 {
 public:
     npc_neeru_fireblade() : CreatureScript("npc_neeru_fireblade") { }
@@ -82,7 +83,8 @@ enum eShenthul
 {
     QUEST_SHATTERED_SALUTE  = 2460
 };
-
class npc_shenthul : public CreatureScript
+
+class npc_shenthul : public CreatureScript
 {
 public:
     npc_shenthul() : CreatureScript("npc_shenthul") { }
@@ -188,7 +190,8 @@ public:
 #define GOSSIP_STW5 "I live only to serve, Warchief! My life is empty and meaningless without your guidance."
 #define GOSSIP_STW6 "Of course, Warchief!"
 
-//TODO: verify abilities/timers
class npc_thrall_warchief : public CreatureScript
+//TODO: verify abilities/timers
+class npc_thrall_warchief : public CreatureScript
 {
 public:
     npc_thrall_warchief() : CreatureScript("npc_thrall_warchief") { }
diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp
index a0588735c64..5925fc815c8 100644
--- a/src/server/scripts/Kalimdor/thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp
@@ -36,7 +36,8 @@ EndScriptData */
 #define SPELL_UPPERCUT          22916
 
 #define GOSSIP_HCB "I know this is rather silly but a young ward who is a bit shy would like your hoofprint."
-//TODO: verify abilities/timers
class npc_cairne_bloodhoof : public CreatureScript
+//TODO: verify abilities/timers
+class npc_cairne_bloodhoof : public CreatureScript
 {
 public:
     npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { }