aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorclick <none@none>2010-08-18 20:35:29 +0200
committerclick <none@none>2010-08-18 20:35:29 +0200
commit95f0d56077db91af54640a046bb6868f86a70823 (patch)
treeb9308f744ed960be456f8104b52370115166dcda /src
parent8bf208c0fd6b230ef4ee831cbb813fc92c3e21b2 (diff)
Core/Scripts: Fix even more scriptbugs from convertion (thanks to Kierkegaard)
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp2
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp2
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp2
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp2
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp356
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp8
9 files changed, 188 insertions, 190 deletions
diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
index 40a4a7cfcba..028234604a2 100644
--- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
+++ b/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);
}
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index ab936726dfe..132860ea083 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/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);
}
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index ebafe9e9bff..70f4df650a4 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/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);
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 34b1b6de9da..159b61b9c4f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/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);
}
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 3cf36619c4e..05026aa331b 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/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);
}
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index a13c8973749..3a9aa1723e9 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/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);
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
index 5c5b1edab48..dd476ff6937 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
@@ -34,226 +34,224 @@ enum GameObjects
ENTRY_GORK_PALEHOOF_SPHERE = 188593
};
-struct instance_pinnacle : public InstanceScript
+class instance_utgarde_pinnacle : public InstanceMapScript
{
- instance_pinnacle(Map* pMap) : InstanceScript(pMap) {Initialize();};
-
- uint64 uiSvalaSorrowgrave;
- uint64 uiGortokPalehoof;
- uint64 uiSkadiTheRuthless;
- uint64 uiKingYmiron;
+public:
+ instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { }
- uint64 uiSkadiTheRuthlessDoor;
- uint64 uiKingYmironDoor;
- uint64 uiGortokPalehoofSphere;
+ InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ {
+ return new instance_pinnacle(pMap);
+ }
- uint64 uiFrenziedWorgen;
- uint64 uiRavenousFurbolg;
- uint64 uiFerociousRhino;
- uint64 uiMassiveJormungar;
- uint64 uiPalehoofOrb;
+ struct instance_pinnacle : public InstanceScript
+ {
+ instance_pinnacle(Map* pMap) : InstanceScript(pMap) {Initialize();};
- uint64 uiSvala;
- uint64 uiSacrificedPlayer;
+ uint64 uiSvalaSorrowgrave;
+ uint64 uiGortokPalehoof;
+ uint64 uiSkadiTheRuthless;
+ uint64 uiKingYmiron;
- uint32 m_auiEncounter[MAX_ENCOUNTER];
+ uint64 uiSkadiTheRuthlessDoor;
+ uint64 uiKingYmironDoor;
+ uint64 uiGortokPalehoofSphere;
- std::string str_data;
+ uint64 uiFrenziedWorgen;
+ uint64 uiRavenousFurbolg;
+ uint64 uiFerociousRhino;
+ uint64 uiMassiveJormungar;
+ uint64 uiPalehoofOrb;
- void Initialize()
- {
- for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
- m_auiEncounter[i] = NOT_STARTED;
-
- uiSvalaSorrowgrave = 0;
- uiGortokPalehoof = 0;
- uiSkadiTheRuthless = 0;
- uiKingYmiron = 0;
-
- uiSkadiTheRuthlessDoor = 0;
- uiKingYmironDoor = 0;
- uiGortokPalehoofSphere = 0;
-
- uiFrenziedWorgen = 0;
- uiRavenousFurbolg = 0;
- uiFerociousRhino = 0;
- uiMassiveJormungar = 0;
- uiPalehoofOrb = 0;
-
- uiSvala = 0;
- uiSacrificedPlayer = 0;
- }
+ uint64 uiSvala;
+ uint64 uiSacrificedPlayer;
- bool IsEncounterInProgress() const
- {
- for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
- if (m_auiEncounter[i] == IN_PROGRESS) return true;
+ uint32 m_auiEncounter[MAX_ENCOUNTER];
- return false;
- }
+ std::string str_data;
- void OnCreatureCreate(Creature* pCreature, bool /*add*/)
- {
- switch(pCreature->GetEntry())
+ void Initialize()
{
- case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = pCreature->GetGUID(); break;
- case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = pCreature->GetGUID(); break;
- case BOSS_SKADI_RUTHLESS: uiSkadiTheRuthless = pCreature->GetGUID(); break;
- case BOSS_KING_YMIRON: uiKingYmiron = pCreature->GetGUID(); break;
- case MOB_FRENZIED_WORGEN: uiFrenziedWorgen = pCreature->GetGUID(); break;
- case MOB_RAVENOUS_FURBOLG: uiRavenousFurbolg = pCreature->GetGUID(); break;
- case MOB_MASSIVE_JORMUNGAR: uiMassiveJormungar = pCreature->GetGUID(); break;
- case MOB_FEROCIOUS_RHINO: uiFerociousRhino = pCreature->GetGUID(); break;
- case MOB_SVALA: uiSvala = pCreature->GetGUID(); break;
- case MOB_PALEHOOF_ORB: uiPalehoofOrb = pCreature->GetGUID(); break;
+ for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+ m_auiEncounter[i] = NOT_STARTED;
+
+ uiSvalaSorrowgrave = 0;
+ uiGortokPalehoof = 0;
+ uiSkadiTheRuthless = 0;
+ uiKingYmiron = 0;
+
+ uiSkadiTheRuthlessDoor = 0;
+ uiKingYmironDoor = 0;
+ uiGortokPalehoofSphere = 0;
+
+ uiFrenziedWorgen = 0;
+ uiRavenousFurbolg = 0;
+ uiFerociousRhino = 0;
+ uiMassiveJormungar = 0;
+ uiPalehoofOrb = 0;
+
+ uiSvala = 0;
+ uiSacrificedPlayer = 0;
}
- }
- void OnGameObjectCreate(GameObject* pGo, bool /*add*/)
- {
- switch(pGo->GetEntry())
+ bool IsEncounterInProgress() const
{
- case ENTRY_SKADI_THE_RUTHLESS_DOOR:
- uiSkadiTheRuthlessDoor = pGo->GetGUID();
- if (m_auiEncounter[2] == DONE) HandleGameObject(NULL,true,pGo);
- break;
- case ENTRY_KING_YMIRON_DOOR:
- uiKingYmironDoor = pGo->GetGUID();
- if (m_auiEncounter[3] == DONE) HandleGameObject(NULL,true,pGo);
- break;
- case ENTRY_GORK_PALEHOOF_SPHERE:
- uiGortokPalehoofSphere = pGo->GetGUID();
- if (m_auiEncounter[1] == DONE)
- {
- HandleGameObject(NULL,true,pGo);
- pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
- }
- break;
+ for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+ if (m_auiEncounter[i] == IN_PROGRESS) return true;
+
+ return false;
}
- }
- void SetData(uint32 type, uint32 data)
- {
- switch(type)
+ void OnCreatureCreate(Creature* pCreature, bool /*add*/)
{
- case DATA_SVALA_SORROWGRAVE_EVENT:
- m_auiEncounter[0] = data;
- break;
- case DATA_GORTOK_PALEHOOF_EVENT:
- m_auiEncounter[1] = data;
- break;
- case DATA_SKADI_THE_RUTHLESS_EVENT:
- if (data == DONE)
- HandleGameObject(uiSkadiTheRuthlessDoor,true);
- m_auiEncounter[2] = data;
- break;
- case DATA_KING_YMIRON_EVENT:
- if (data == DONE)
- HandleGameObject(uiKingYmironDoor,true);
- m_auiEncounter[3] = data;
- break;
+ switch(pCreature->GetEntry())
+ {
+ case BOSS_SVALA_SORROWGRAVE: uiSvalaSorrowgrave = pCreature->GetGUID(); break;
+ case BOSS_GORTOK_PALEHOOF: uiGortokPalehoof = pCreature->GetGUID(); break;
+ case BOSS_SKADI_RUTHLESS: uiSkadiTheRuthless = pCreature->GetGUID(); break;
+ case BOSS_KING_YMIRON: uiKingYmiron = pCreature->GetGUID(); break;
+ case MOB_FRENZIED_WORGEN: uiFrenziedWorgen = pCreature->GetGUID(); break;
+ case MOB_RAVENOUS_FURBOLG: uiRavenousFurbolg = pCreature->GetGUID(); break;
+ case MOB_MASSIVE_JORMUNGAR: uiMassiveJormungar = pCreature->GetGUID(); break;
+ case MOB_FEROCIOUS_RHINO: uiFerociousRhino = pCreature->GetGUID(); break;
+ case MOB_SVALA: uiSvala = pCreature->GetGUID(); break;
+ case MOB_PALEHOOF_ORB: uiPalehoofOrb = pCreature->GetGUID(); break;
+ }
}
- if (data == DONE)
- SaveToDB();
- }
-
- void SetData64(uint32 type, uint64 data)
- {
- if (type == DATA_SACRIFICED_PLAYER)
- uiSacrificedPlayer = data;
- }
-
- uint32 GetData(uint32 type)
- {
- switch(type)
+ void OnGameObjectCreate(GameObject* pGo, bool /*add*/)
{
- case DATA_SVALA_SORROWGRAVE_EVENT: return m_auiEncounter[0];
- case DATA_GORTOK_PALEHOOF_EVENT: return m_auiEncounter[1];
- case DATA_SKADI_THE_RUTHLESS_EVENT: return m_auiEncounter[2];
- case DATA_KING_YMIRON_EVENT: return m_auiEncounter[3];
+ switch(pGo->GetEntry())
+ {
+ case ENTRY_SKADI_THE_RUTHLESS_DOOR:
+ uiSkadiTheRuthlessDoor = pGo->GetGUID();
+ if (m_auiEncounter[2] == DONE) HandleGameObject(NULL,true,pGo);
+ break;
+ case ENTRY_KING_YMIRON_DOOR:
+ uiKingYmironDoor = pGo->GetGUID();
+ if (m_auiEncounter[3] == DONE) HandleGameObject(NULL,true,pGo);
+ break;
+ case ENTRY_GORK_PALEHOOF_SPHERE:
+ uiGortokPalehoofSphere = pGo->GetGUID();
+ if (m_auiEncounter[1] == DONE)
+ {
+ HandleGameObject(NULL,true,pGo);
+ pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
+ }
+ break;
+ }
}
- return 0;
- }
- uint64 GetData64(uint32 identifier)
- {
- switch(identifier)
+ void SetData(uint32 type, uint32 data)
{
- case DATA_SVALA_SORROWGRAVE: return uiSvalaSorrowgrave;
- case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof;
- case DATA_SKADI_THE_RUTHLESS: return uiSkadiTheRuthless;
- case DATA_KING_YMIRON: return uiKingYmiron;
- case DATA_MOB_FRENZIED_WORGEN: return uiFrenziedWorgen;
- case DATA_MOB_RAVENOUS_FURBOLG: return uiRavenousFurbolg;
- case DATA_MOB_MASSIVE_JORMUNGAR: return uiMassiveJormungar;
- case DATA_MOB_FEROCIOUS_RHINO: return uiFerociousRhino;
- case DATA_MOB_ORB: return uiPalehoofOrb;
- case DATA_SVALA: return uiSvala;
- case DATA_GORTOK_PALEHOOF_SPHERE: return uiGortokPalehoofSphere;
+ switch(type)
+ {
+ case DATA_SVALA_SORROWGRAVE_EVENT:
+ m_auiEncounter[0] = data;
+ break;
+ case DATA_GORTOK_PALEHOOF_EVENT:
+ m_auiEncounter[1] = data;
+ break;
+ case DATA_SKADI_THE_RUTHLESS_EVENT:
+ if (data == DONE)
+ HandleGameObject(uiSkadiTheRuthlessDoor,true);
+ m_auiEncounter[2] = data;
+ break;
+ case DATA_KING_YMIRON_EVENT:
+ if (data == DONE)
+ HandleGameObject(uiKingYmironDoor,true);
+ m_auiEncounter[3] = data;
+ break;
+ }
+
+ if (data == DONE)
+ SaveToDB();
}
- return 0;
- }
-
- std::string GetSaveData()
- {
- OUT_SAVE_INST_DATA;
-
- std::ostringstream saveStream;
- saveStream << "U P " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " "
- << m_auiEncounter[2] << " " << m_auiEncounter[3];
-
- str_data = saveStream.str();
+ void SetData64(uint32 type, uint64 data)
+ {
+ if (type == DATA_SACRIFICED_PLAYER)
+ uiSacrificedPlayer = data;
+ }
- OUT_SAVE_INST_DATA_COMPLETE;
- return str_data;
- }
+ uint32 GetData(uint32 type)
+ {
+ switch(type)
+ {
+ case DATA_SVALA_SORROWGRAVE_EVENT: return m_auiEncounter[0];
+ case DATA_GORTOK_PALEHOOF_EVENT: return m_auiEncounter[1];
+ case DATA_SKADI_THE_RUTHLESS_EVENT: return m_auiEncounter[2];
+ case DATA_KING_YMIRON_EVENT: return m_auiEncounter[3];
+ }
+ return 0;
+ }
- void Load(const char* in)
- {
- if (!in)
+ uint64 GetData64(uint32 identifier)
{
- OUT_LOAD_INST_DATA_FAIL;
- return;
+ switch(identifier)
+ {
+ case DATA_SVALA_SORROWGRAVE: return uiSvalaSorrowgrave;
+ case DATA_GORTOK_PALEHOOF: return uiGortokPalehoof;
+ case DATA_SKADI_THE_RUTHLESS: return uiSkadiTheRuthless;
+ case DATA_KING_YMIRON: return uiKingYmiron;
+ case DATA_MOB_FRENZIED_WORGEN: return uiFrenziedWorgen;
+ case DATA_MOB_RAVENOUS_FURBOLG: return uiRavenousFurbolg;
+ case DATA_MOB_MASSIVE_JORMUNGAR: return uiMassiveJormungar;
+ case DATA_MOB_FEROCIOUS_RHINO: return uiFerociousRhino;
+ case DATA_MOB_ORB: return uiPalehoofOrb;
+ case DATA_SVALA: return uiSvala;
+ case DATA_GORTOK_PALEHOOF_SPHERE: return uiGortokPalehoofSphere;
+ }
+
+ return 0;
}
- OUT_LOAD_INST_DATA(in);
+ std::string GetSaveData()
+ {
+ OUT_SAVE_INST_DATA;
- char dataHead1, dataHead2;
- uint16 data0, data1, data2, data3;
+ std::ostringstream saveStream;
+ saveStream << "U P " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " "
+ << m_auiEncounter[2] << " " << m_auiEncounter[3];
- std::istringstream loadStream(in);
- loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3;
+ str_data = saveStream.str();
- if (dataHead1 == 'U' && dataHead2 == 'P')
+ OUT_SAVE_INST_DATA_COMPLETE;
+ return str_data;
+ }
+
+ void Load(const char* in)
{
- m_auiEncounter[0] = data0;
- m_auiEncounter[1] = data1;
- m_auiEncounter[2] = data2;
- m_auiEncounter[3] = data3;
+ if (!in)
+ {
+ OUT_LOAD_INST_DATA_FAIL;
+ return;
+ }
- for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
- if (m_auiEncounter[i] == IN_PROGRESS)
- m_auiEncounter[i] = NOT_STARTED;
+ OUT_LOAD_INST_DATA(in);
- } else OUT_LOAD_INST_DATA_FAIL;
+ char dataHead1, dataHead2;
+ uint16 data0, data1, data2, data3;
- OUT_LOAD_INST_DATA_COMPLETE;
- }
-};
+ std::istringstream loadStream(in);
+ loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3;
-class instance_utgarde_pinnacle : public InstanceMapScript
-{
-public:
- instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { }
+ if (dataHead1 == 'U' && dataHead2 == 'P')
+ {
+ m_auiEncounter[0] = data0;
+ m_auiEncounter[1] = data1;
+ m_auiEncounter[2] = data2;
+ m_auiEncounter[3] = data3;
- InstanceScript* GetInstanceScript(InstanceMap* pMap) const
- {
- return new instance_pinnacle(pMap);
- }
+ for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+ if (m_auiEncounter[i] == IN_PROGRESS)
+ m_auiEncounter[i] = NOT_STARTED;
+ } else OUT_LOAD_INST_DATA_FAIL;
+ OUT_LOAD_INST_DATA_COMPLETE;
+ }
+ };
};
void AddSC_instance_utgarde_pinnacle()
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index aded4484575..1ba6d2ef52d 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/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);
}
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index e068d3e7004..456d19ab7ea 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/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);
- }
+ InstanceScript* GetInstanceScript(InstanceMap* pMap) const
+ {
+ return new instance_mechanar_InstanceMapScript(pMap);
+ }
};