From c4098897a8d2f6cc55dd6434eb3b6f5468791f2a Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 16 Jun 2020 23:08:56 +0200 Subject: game/AI: Convert SelectAggroTarget to enum class (#24818) * game/AI: Convert SelectAggroTarget to enum class * game/AI: Rename SelectAggroTarget to SelectTargetMethod (cherry picked from commit 418c3b1fd50664aad035bd975a65281e82ba2dea) --- .../scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp | 2 +- .../scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp | 2 +- .../scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp | 4 ++-- src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/scripts/EasternKingdoms/Stratholme') diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 92da0c408a3..6d83a03d636 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -110,7 +110,7 @@ public: switch (eventId) { case EVENT_SHADOWBOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOWBOLT); events.Repeat(10s); break; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 71218683781..241af832759 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -100,7 +100,7 @@ struct boss_baroness_anastari : public BossAI events.Repeat(13s); break; case EVENT_SPELL_POSSESS: - if (Unit* possessTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, false)) + if (Unit* possessTarget = SelectTarget(SelectTargetMethod::Random, 1, 0, true, false)) { DoCast(possessTarget, SPELL_POSSESS, true); DoCast(possessTarget, SPELL_POSSESSED, true); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 540fd77a378..51f45a4c634 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -198,7 +198,7 @@ public: //PsychicScream if (m_uiPsychicScream_Timer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_PSYCHICSCREAM); m_uiPsychicScream_Timer = 20000; @@ -207,7 +207,7 @@ public: //DeepSleep if (m_uiDeepSleep_Timer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 2634441d8b4..8cc283fb41e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -276,7 +276,7 @@ public: //HauntingTimer if (HauntingTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_HAUNTING_PHANTOM); HauntingTimer = 11000; } @@ -285,7 +285,7 @@ public: //TouchTimer if (TouchTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_DEBILITATING_TOUCH); TouchTimer = 7000; } -- cgit v1.2.3