From 3df16c12b75c27c85b720a3eced4943a06f060f5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Jan 2023 21:23:06 +0100 Subject: Core/Scripts: Move EvadeReason outside of CreatureAI class --- .../Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp | 2 +- .../Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp | 2 +- src/server/scripts/Outland/BlackTemple/boss_illidan.cpp | 2 +- src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp | 4 ++-- .../Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/scripts/Outland') diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 252e1ac88f4..1d246096c7b 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -133,7 +133,7 @@ struct boss_ambassador_hellmaw : public EscortAI if (me->HasAura(SPELL_BANISH)) { - EnterEvadeMode(EVADE_REASON_OTHER); + EnterEvadeMode(EvadeReason::Other); return; } diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 39488ff7709..50e8cc2d488 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -112,7 +112,7 @@ struct boss_blackheart_the_inciter : public BossAI else { if (!charmCount) - EnterEvadeMode(EVADE_REASON_OTHER); // sanity check + EnterEvadeMode(EvadeReason::Other); // sanity check --charmCount; } if (charmCount) diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 2a072e86ead..7bbd48dfe6a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -699,7 +699,7 @@ struct boss_illidan_stormrage : public BossAI if (player->IsAlive() && !player->IsGameMaster() && IsInBoundary(player)) return; - EnterEvadeMode(EVADE_REASON_NO_HOSTILES); + EnterEvadeMode(EvadeReason::NoHostiles); } void SummonMinions() diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 92d577f4d6d..3ecaaf5e886 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -290,7 +290,7 @@ struct boss_shade_of_akama : public BossAI if (player->IsAlive() && !player->IsGameMaster() && IsInBoundary(player)) return; - EnterEvadeMode(EVADE_REASON_NO_HOSTILES); + EnterEvadeMode(EvadeReason::NoHostiles); } void UpdateAI(uint32 diff) override @@ -529,7 +529,7 @@ struct npc_akama_shade : public ScriptedAI Talk(SAY_DEAD); if (Creature* shade = _instance->GetCreature(DATA_SHADE_OF_AKAMA)) if (shade->IsAlive()) - shade->AI()->EnterEvadeMode(EVADE_REASON_OTHER); + shade->AI()->EnterEvadeMode(EvadeReason::Other); } bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 8350dc0ad48..4600933b378 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -347,7 +347,7 @@ struct npc_hellfire_channeler : public ScriptedAI { if (_instance->GetBossState(DATA_MAGTHERIDON) == IN_PROGRESS) if (Creature* magtheridon = _instance->GetCreature(DATA_MAGTHERIDON)) - magtheridon->AI()->EnterEvadeMode(EVADE_REASON_OTHER); + magtheridon->AI()->EnterEvadeMode(EvadeReason::Other); } void UpdateAI(uint32 diff) override -- cgit v1.2.3