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/Outland/GruulsLair | |
| 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/Outland/GruulsLair')
| -rw-r--r-- | src/server/scripts/Outland/GruulsLair/boss_gruul.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 2ac442674ce..f050c1d9e39 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -104,9 +104,9 @@ class boss_gruul : public CreatureScript Initialize(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { - _EnterCombat(); + _JustEngagedWith(); Talk(SAY_AGGRO); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 02e2ee579c5..b217ef479eb 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -131,7 +131,7 @@ public: Talk(SAY_OGRE_DEATH); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -254,7 +254,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -341,7 +341,7 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -433,7 +433,7 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); @@ -516,7 +516,7 @@ public: instance->SetBossState(DATA_MAULGAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoZoneInCombat(); instance->SetBossState(DATA_MAULGAR, IN_PROGRESS); |