diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-12-31 03:23:42 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-04-16 20:22:13 +0200 |
| commit | bce43de7f3fba618c370f2aba327d23dd30d1cdd (patch) | |
| tree | 85b786bfa8f5103aaafa0ec01e93b337c29d4a15 /src/server/scripts/EasternKingdoms/ScarletEnclave | |
| parent | 8eb3c61f1aea5610cf68fb622f41850d2b934c51 (diff) | |
Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now.
(cherry picked from commit 6113b9dec2e0081c36c36c2974a28ed0693bc601)
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ScarletEnclave')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 2b3bb2e066b..8e8165c5e66 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -135,7 +135,7 @@ public: me->LoadEquipment(0, true); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST); @@ -852,7 +852,7 @@ public: { npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) { } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { me->ExitVehicle(); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 86fc1dc0c90..aa2cf832825 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -408,7 +408,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_TREE2); me->Dismount(); @@ -509,7 +509,7 @@ public: Initialize(); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_VALROTH_AGGRO); DoCast(who, SPELL_VALROTH_SMITE); |