From 4806afef45c60280a3def650dd0437bd36deb45a Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 1 Dec 2016 04:02:32 +0100 Subject: [PATCH] fix build --- .../AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp | 4 ++-- src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp | 6 +++--- .../scripts/Outland/BlackTemple/instance_black_temple.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 0d52a09bbdc..4443b6fa28f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -1027,7 +1027,7 @@ class spell_gatewatcher_web_wrap : public SpellScriptLoader OnEffectRemove += AuraEffectRemoveFn(spell_gatewatcher_web_wrap_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_ROOT, AURA_EFFECT_HANDLE_REAL); } }; - + AuraScript* GetAuraScript() const override { return new spell_gatewatcher_web_wrap_AuraScript(); @@ -1048,7 +1048,7 @@ class achievement_watch_him_die : public AchievementCriteriaScript if (!instance) return false; - for (DataTypes watcherData : {DATA_WATCHER_GASHRA, DATA_WATCHER_NARJIL, DATA_WATCHER_SILTHIK}) + for (ANDataTypes watcherData : {DATA_WATCHER_GASHRA, DATA_WATCHER_NARJIL, DATA_WATCHER_SILTHIK}) { if (Creature* watcher = instance->GetCreature(watcherData)) if (watcher->IsAlive()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index c34b3be99ea..b3091669af1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -107,7 +107,7 @@ enum SummonGroups SUMMON_GROUP_GUARDIAN_FIRST = 01 /*..04 */, SUMMON_GROUP_MINION_FIRST = 05 /*..11 */ }; -static const std::initializer_list portalList = { DATA_KELTHUZAD_PORTAL01, DATA_KELTHUZAD_PORTAL02, DATA_KELTHUZAD_PORTAL03, DATA_KELTHUZAD_PORTAL04 }; +static const std::initializer_list portalList = { DATA_KELTHUZAD_PORTAL01, DATA_KELTHUZAD_PORTAL02, DATA_KELTHUZAD_PORTAL03, DATA_KELTHUZAD_PORTAL04 }; enum Phases { @@ -227,7 +227,7 @@ public: } void EnterEvadeMode(EvadeReason /*why*/) override { - for (Data64 portalData : portalList) + for (NAXData64 portalData : portalList) if (GameObject* portal = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(portalData))) portal->SetGoState(GO_STATE_READY); @@ -469,7 +469,7 @@ public: case EVENT_TRANSITION_REPLY: if (Creature* lichKing = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_LICH_KING))) lichKing->AI()->Talk(SAY_ANSWER_REQUEST); - for (Data64 portalData : portalList) + for (NAXData64 portalData : portalList) if (GameObject* portal = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(portalData))) portal->SetGoState(GO_STATE_ACTIVE); break; diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index f7b751012f3..8ac113b7b6e 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -135,7 +135,7 @@ class instance_black_temple : public InstanceMapScript bool CheckDenOfMortalDoor() { - for (DataTypes boss : {DATA_SHADE_OF_AKAMA, DATA_TERON_GOREFIEND, DATA_RELIQUARY_OF_SOULS, DATA_GURTOGG_BLOODBOIL}) + for (BTDataTypes boss : {DATA_SHADE_OF_AKAMA, DATA_TERON_GOREFIEND, DATA_RELIQUARY_OF_SOULS, DATA_GURTOGG_BLOODBOIL}) if (GetBossState(boss) != DONE) return false; return true;