Core/Scripts: Fix even more scriptbugs from convertion (thanks to Kierkegaard)

--HG--
branch : trunk

src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp

@@ -45,7 +45,7 @@ class instance_molten_core : public InstanceMapScript
 public:
     instance_molten_core() : InstanceMapScript("instance_molten_core", 409) { }
 
-    InstanceScript* GetInstance_InstanceMapScript(Map* pMap)
+    InstanceScript* GetInstanceScript(Map* pMap)
     {
         return new instance_molten_core_InstanceMapScript (pMap);
     }

src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp

@@ -290,7 +290,7 @@ class instance_uldaman : public InstanceMapScript
             } // end GetData64
         };
 
-        InstanceScript* OnGetInstanceData(InstanceMap* pMap)
+        InstanceScript* GetInstanceScript(InstanceMap* pMap)
         {
             return new instance_uldaman_InstanceMapScript(pMap);
         }

src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp

@@ -153,7 +153,7 @@ class instance_zulgurub : public InstanceMapScript
             }
         };
 
-        InstanceScript* OnGetInstanceData(InstanceMap* pMap)
+        InstanceScript* GetInstanceScript(InstanceMap* pMap)
         {
             return new instance_zulgurub_InstanceMapScript(pMap);
         }

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp

@@ -46,7 +46,7 @@ class instance_hyjal : public InstanceMapScript
 public:
     instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { }
 
-    InstanceScript* GetInstanceData_instance_mount_hyjal_InstanceMapScript(Map* pMap)
+    InstanceScript* GetInstanceScript(Map* pMap)
     {
         return new instance_mount_hyjal_InstanceMapScript(pMap);
     }

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp

@@ -41,7 +41,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
 public:
     instance_ruins_of_ahnqiraj() : InstanceMapScript("instance_ruins_of_ahnqiraj", 509) { }
 
-    InstanceScript* GetInstanceData_instance_ruins_of_ahn_qiraj_InstanceMapScript(Map* pMap)
+    InstanceScript* GetInstanceScript(Map* pMap)
     {
         return new instance_ruins_of_ahn_qiraj_InstanceMapScript(pMap);
     }

src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp

@@ -31,7 +31,7 @@ class instance_nexus : public InstanceMapScript
 public:
     instance_nexus() : InstanceMapScript("instance_nexus", 576) { }
 
-    InstanceScript *GetInstanceData_InstanceMapScript(Map *pMap)
+    InstanceScript *GetInstanceScript(Map *pMap)
     {
         return new instance_nexus_InstanceMapScript(pMap);
     }

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp

@@ -34,8 +34,18 @@ enum GameObjects
     ENTRY_GORK_PALEHOOF_SPHERE                    = 188593
 };
 
-struct instance_pinnacle : public InstanceScript
+class instance_utgarde_pinnacle : public InstanceMapScript
 {
+public:
+    instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { }
+
+    InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+    {
+        return new instance_pinnacle(pMap);
+    }
+
+    struct instance_pinnacle : public InstanceScript
+    {
         instance_pinnacle(Map* pMap) : InstanceScript(pMap) {Initialize();};
 
         uint64 uiSvalaSorrowgrave;
@@ -241,19 +251,7 @@ struct instance_pinnacle : public InstanceScript
 
             OUT_LOAD_INST_DATA_COMPLETE;
         }
-};
-
-class instance_utgarde_pinnacle : public InstanceMapScript
-{
-public:
-    instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { }
-
-    InstanceScript* GetInstanceScript(InstanceMap* pMap) const
-    {
-        return new instance_pinnacle(pMap);
-    }
-
-
+    };
 };
 
 void AddSC_instance_utgarde_pinnacle()

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp

@@ -72,7 +72,7 @@ class instance_serpent_shrine : public InstanceMapScript
 public:
     instance_serpent_shrine() : InstanceMapScript("instance_serpent_shrine", 548) { }
 
-    InstanceScript* GetInstanceData_instance_serpentshrine_cavern_InstanceMapScript(Map* pMap)
+    InstanceScript* GetInstanceScript(Map* pMap)
     {
         return new instance_serpentshrine_cavern_InstanceMapScript(pMap);
     }

src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp

@@ -79,11 +79,11 @@ class instance_mechanar : public InstanceMapScript
                 }
             }
         };
+
         InstanceScript* GetInstanceScript(InstanceMap* pMap) const
         {
             return new instance_mechanar_InstanceMapScript(pMap);
         }
-
 };