diff options
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h | 8 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp | 23 |
2 files changed, 8 insertions, 23 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h index e3623bef90b..26df616f30d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -40,10 +40,10 @@ enum HOLDataTypes enum HOLCreaturesIds { // Bosses - BOSS_GENERAL_BJARNGRIM = 28586, - BOSS_VOLKHAN = 28587, - BOSS_IONAR = 28546, - BOSS_LOKEN = 28923 + NPC_GENERAL_BJARNGRIM = 28586, + NPC_VOLKHAN = 28587, + NPC_IONAR = 28546, + NPC_LOKEN = 28923 }; enum HOLGameObjectIds diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 8bda40c0aa3..1bea6368f08 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -32,10 +32,10 @@ DoorData const doorData[] = ObjectData const creatureData[] = { - { BOSS_GENERAL_BJARNGRIM, DATA_GENERAL_BJARNGRIM }, - { BOSS_VOLKHAN, DATA_VOLKHAN }, - { BOSS_IONAR, DATA_IONAR }, - { BOSS_LOKEN, DATA_LOKEN }, + { NPC_GENERAL_BJARNGRIM, DATA_GENERAL_BJARNGRIM }, + { NPC_VOLKHAN, DATA_VOLKHAN }, + { NPC_IONAR, DATA_IONAR }, + { NPC_LOKEN, DATA_LOKEN }, { 0, 0 } // END }; @@ -60,16 +60,6 @@ class instance_halls_of_lightning : public InstanceMapScript LoadDoorData(doorData); } - void OnCreatureCreate(Creature* creature) override - { - InstanceScript::OnCreatureCreate(creature); - } - - void OnGameObjectCreate(GameObject* go) override - { - InstanceScript::OnGameObjectCreate(go); - } - bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) @@ -88,11 +78,6 @@ class instance_halls_of_lightning : public InstanceMapScript return true; } - - ObjectGuid GetGuidData(uint32 type) const override - { - return InstanceScript::GetGuidData(type); - } }; InstanceScript* GetInstanceScript(InstanceMap* map) const override |