aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-08-10 17:41:12 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-08-10 17:42:12 +0200
commit8acefbff8c2b16d6c4316f931616e7c7efd49537 (patch)
tree37cabbea111df5dd3b61370484eec32b1f8e7846 /src/server/scripts/Outland
parent488128bada02784a2eeca392d0ad7d3e6ebfd255 (diff)
Scripted: Use now override for instance scripts
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp12
-rw-r--r--src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp12
-rw-r--r--src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp12
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp14
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp18
-rw-r--r--src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp12
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp10
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp10
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp10
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp6
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp10
-rw-r--r--src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp8
-rw-r--r--src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp8
-rw-r--r--src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp8
14 files changed, 75 insertions, 75 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index 67f4dc1423a..f380914506e 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
@@ -44,13 +44,13 @@ public:
SetBossNumber(EncounterCount);
}
- void Initialize()
+ void Initialize() OVERRIDE
{
SetBossState(DATA_ANZU, NOT_STARTED);
iIkissDoorGUID = 0;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
if (creature->GetEntry() == NPC_ANZU)
{
@@ -61,13 +61,13 @@ public:
}
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
if (go->GetEntry() == GO_IKISS_DOOR)
iIkissDoorGUID = go->GetGUID();
}
- bool SetBossState(uint32 type, EncounterState state)
+ bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -89,7 +89,7 @@ public:
return true;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -100,7 +100,7 @@ public:
return saveStream.str();
}
- void Load(const char* str)
+ void Load(const char* str) OVERRIDE
{
if (!str)
{
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 6e579003262..9a507979d8d 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -57,7 +57,7 @@ public:
uint64 m_uiGrandmasterVorpil;
uint32 m_uiFelOverseerCount;
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -68,7 +68,7 @@ public:
m_uiFelOverseerCount = 0;
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < EncounterCount; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -77,7 +77,7 @@ public:
return false;
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -94,7 +94,7 @@ public:
}
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -194,12 +194,12 @@ public:
return 0;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
return str_data;
}
- void Load(const char* in)
+ void Load(const char* in) OVERRIDE
{
if (!in)
{
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 2a82810a3c1..bd70ce012ba 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -83,7 +83,7 @@ public:
uint64 IllidanGate;
uint64 IllidanDoor[2];
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -115,7 +115,7 @@ public:
IllidanDoor[1] = 0;
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < EncounterCount; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -141,7 +141,7 @@ public:
return NULL;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -160,7 +160,7 @@ public:
}
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -364,12 +364,12 @@ public:
return 0;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
return str_data;
}
- void Load(const char* in)
+ void Load(const char* in) OVERRIDE
{
if (!in)
{
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 79e89740b2d..7590faee1db 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -89,7 +89,7 @@ class instance_serpent_shrine : public InstanceMapScript
{
}
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -122,7 +122,7 @@ class instance_serpent_shrine : public InstanceMapScript
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -131,7 +131,7 @@ class instance_serpent_shrine : public InstanceMapScript
return false;
}
- void Update(uint32 diff)
+ void Update(uint32 diff) OVERRIDE
{
//Water checks
if (WaterCheckTimer <= diff)
@@ -191,7 +191,7 @@ class instance_serpent_shrine : public InstanceMapScript
FrenzySpawnTimer -= diff;
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -216,7 +216,7 @@ class instance_serpent_shrine : public InstanceMapScript
}
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -392,7 +392,7 @@ class instance_serpent_shrine : public InstanceMapScript
return 0;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
std::ostringstream stream;
@@ -402,7 +402,7 @@ class instance_serpent_shrine : public InstanceMapScript
return stream.str();
}
- void Load(const char* in)
+ void Load(const char* in) OVERRIDE
{
if (!in)
{
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index f536f1af45b..56a0e3857fa 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -86,7 +86,7 @@ public:
uint64 AccessPanelHydro;
uint64 AccessPanelMek;
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -98,7 +98,7 @@ public:
AccessPanelMek = 0;
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -107,7 +107,7 @@ public:
return false;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -117,7 +117,7 @@ public:
}
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -127,7 +127,7 @@ public:
}
}
- void SetData(uint32 type, uint32 data)
+ void SetData(uint32 type, uint32 data) OVERRIDE
{
switch (type)
{
@@ -167,7 +167,7 @@ public:
SaveToDB();
}
- uint32 GetData(uint32 type) const
+ uint32 GetData(uint32 type) const OVERRIDE
{
switch (type)
{
@@ -183,7 +183,7 @@ public:
return 0;
}
- uint64 GetData64(uint32 data) const
+ uint64 GetData64(uint32 data) const OVERRIDE
{
switch (data)
{
@@ -197,7 +197,7 @@ public:
return 0;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -208,7 +208,7 @@ public:
return stream.str();
}
- void Load(const char* in)
+ void Load(const char* in) OVERRIDE
{
if (!in)
{
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 3fbdfe94c05..d8399793df4 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -60,7 +60,7 @@ public:
uint64 MaulgarDoor;
uint64 GruulDoor;
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -75,7 +75,7 @@ public:
GruulDoor = 0;
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -84,7 +84,7 @@ public:
return false;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -96,7 +96,7 @@ public:
}
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -166,7 +166,7 @@ public:
return 0;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
std::ostringstream stream;
@@ -176,7 +176,7 @@ public:
return stream.str();
}
- void Load(const char* in)
+ void Load(const char* in) OVERRIDE
{
if (!in)
{
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 22b1b776e40..2193d3841a6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -77,7 +77,7 @@ class instance_blood_furnace : public InstanceMapScript
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -114,7 +114,7 @@ class instance_blood_furnace : public InstanceMapScript
BroggokLeverGUID = 0;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -133,13 +133,13 @@ class instance_blood_furnace : public InstanceMapScript
}
}
- void OnUnitDeath(Unit* unit)
+ void OnUnitDeath(Unit* unit) OVERRIDE
{
if (unit && unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == 17398)
PrisonerDied(unit->GetGUID());
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
if (go->GetEntry() == 181766) //Final exit door
Door1GUID = go->GetGUID();
@@ -247,7 +247,7 @@ class instance_blood_furnace : public InstanceMapScript
return str_data.c_str();
}
- void Load(const char* in)
+ void Load(const char* in) OVERRIDE
{
if (!in)
{
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 98f6f194c0f..54ca34c2708 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -36,13 +36,13 @@ class instance_ramparts : public InstanceMapScript
{
instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map) {}
- void Initialize()
+ void Initialize() OVERRIDE
{
SetBossNumber(EncounterCount);
felIronChestGUID = 0;
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -53,7 +53,7 @@ class instance_ramparts : public InstanceMapScript
}
}
- bool SetBossState(uint32 type, EncounterState state)
+ bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -72,7 +72,7 @@ class instance_ramparts : public InstanceMapScript
return true;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -83,7 +83,7 @@ class instance_ramparts : public InstanceMapScript
return saveStream.str();
}
- void Load(const char* strIn)
+ void Load(const char* strIn) OVERRIDE
{
if (!strIn)
{
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index efca48505a8..bfe829de9fd 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -66,7 +66,7 @@ class instance_magtheridons_lair : public InstanceMapScript
uint32 CageTimer;
uint32 RespawnTimer;
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -79,7 +79,7 @@ class instance_magtheridons_lair : public InstanceMapScript
RespawnTimer = 0;
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -88,7 +88,7 @@ class instance_magtheridons_lair : public InstanceMapScript
return false;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -101,7 +101,7 @@ class instance_magtheridons_lair : public InstanceMapScript
}
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -218,7 +218,7 @@ class instance_magtheridons_lair : public InstanceMapScript
return 0;
}
- void Update(uint32 diff)
+ void Update(uint32 diff) OVERRIDE
{
if (CageTimer)
{
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 1919e74e4ee..1484c5e9127 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -41,7 +41,7 @@ class instance_shattered_halls : public InstanceMapScript
{
instance_shattered_halls_InstanceMapScript(Map* map) : InstanceScript(map) { }
- void Initialize()
+ void Initialize() OVERRIDE
{
SetBossNumber(EncounterCount);
nethekurseGUID = 0;
@@ -114,7 +114,7 @@ class instance_shattered_halls : public InstanceMapScript
return 0;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -125,7 +125,7 @@ class instance_shattered_halls : public InstanceMapScript
return saveStream.str();
}
- void Load(const char* strIn)
+ void Load(const char* strIn) OVERRIDE
{
if (!strIn)
{
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index e47995befff..9995efee99a 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -60,7 +60,7 @@ class instance_the_eye : public InstanceMapScript
uint32 m_auiEncounter[MAX_ENCOUNTER];
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -76,7 +76,7 @@ class instance_the_eye : public InstanceMapScript
AlarEventPhase = 0;
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -85,7 +85,7 @@ class instance_the_eye : public InstanceMapScript
return false;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -163,7 +163,7 @@ class instance_the_eye : public InstanceMapScript
return 0;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -174,7 +174,7 @@ class instance_the_eye : public InstanceMapScript
return stream.str();
}
- void Load(const char* in)
+ void Load(const char* in) OVERRIDE
{
if (!in)
{
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index 64ebef52a87..9c60c16d0af 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
@@ -57,7 +57,7 @@ class instance_mechanar : public InstanceMapScript
}
}
- void OnGameObjectRemove(GameObject* gameObject)
+ void OnGameObjectRemove(GameObject* gameObject) OVERRIDE
{
switch (gameObject->GetEntry())
{
@@ -71,7 +71,7 @@ class instance_mechanar : public InstanceMapScript
}
}
- bool SetBossState(uint32 type, EncounterState state)
+ bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -91,7 +91,7 @@ class instance_mechanar : public InstanceMapScript
return true;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -102,7 +102,7 @@ class instance_mechanar : public InstanceMapScript
return saveStream.str();
}
- void Load(const char* str)
+ void Load(const char* str) OVERRIDE
{
if (!str)
{
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 725c5c5aa17..41b87495c93 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -75,7 +75,7 @@ class instance_arcatraz : public InstanceMapScript
uint64 GoSphereGUID;
uint64 MellicharGUID;
- void Initialize()
+ void Initialize() OVERRIDE
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -91,7 +91,7 @@ class instance_arcatraz : public InstanceMapScript
MellicharGUID = 0;
}
- bool IsEncounterInProgress() const
+ bool IsEncounterInProgress() const OVERRIDE
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
if (m_auiEncounter[i] == IN_PROGRESS)
@@ -100,7 +100,7 @@ class instance_arcatraz : public InstanceMapScript
return false;
}
- void OnGameObjectCreate(GameObject* go)
+ void OnGameObjectCreate(GameObject* go) OVERRIDE
{
switch (go->GetEntry())
{
@@ -142,7 +142,7 @@ class instance_arcatraz : public InstanceMapScript
}
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
if (creature->GetEntry() == MELLICHAR)
MellicharGUID = creature->GetGUID();
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
index 443a8aa55fa..1bcfc9cbb21 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -35,7 +35,7 @@ class instance_the_botanica : public InstanceMapScript
WarpSplinterGUID = 0;
}
- void OnCreatureCreate(Creature* creature)
+ void OnCreatureCreate(Creature* creature) OVERRIDE
{
switch (creature->GetEntry())
{
@@ -80,7 +80,7 @@ class instance_the_botanica : public InstanceMapScript
return 0;
}
- bool SetBossState(uint32 type, EncounterState state)
+ bool SetBossState(uint32 type, EncounterState state) OVERRIDE
{
if (!InstanceScript::SetBossState(type, state))
return false;
@@ -100,7 +100,7 @@ class instance_the_botanica : public InstanceMapScript
return true;
}
- std::string GetSaveData()
+ std::string GetSaveData() OVERRIDE
{
OUT_SAVE_INST_DATA;
@@ -111,7 +111,7 @@ class instance_the_botanica : public InstanceMapScript
return saveStream.str();
}
- void Load(char const* str)
+ void Load(char const* str) OVERRIDE
{
if (!str)
{