aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/AI/ScriptedAI
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/AI/ScriptedAI')
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedCreature.cpp4
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedCreature.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index 8b2d0b0e410..7440aa1b178 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -496,7 +496,7 @@ void BossAI::_JustReachedHome()
me->setActive(false);
}
-void BossAI::_EnterCombat()
+void BossAI::_JustEngagedWith()
{
if (instance)
{
@@ -609,7 +609,7 @@ void WorldBossAI::_JustDied()
summons.DespawnAll();
}
-void WorldBossAI::_EnterCombat()
+void WorldBossAI::_JustEngagedWith()
{
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true);
if (target)
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
index 9f2e49c1ffb..b184d834804 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
@@ -186,9 +186,9 @@ struct TC_GAME_API ScriptedAI : public CreatureAI
void Reset() override { }
//Called at creature aggro either by MoveInLOS or Attack Start
- void EnterCombat(Unit* /*victim*/) override { }
+ void JustEngagedWith(Unit* /*victim*/) override { }
- // Called before EnterCombat even before the creature is in combat.
+ // Called before JustEngagedWith even before the creature is in combat.
void AttackStart(Unit* /*target*/) override;
// *************
@@ -355,7 +355,7 @@ class TC_GAME_API BossAI : public ScriptedAI
virtual void ScheduleTasks() { }
void Reset() override { _Reset(); }
- void EnterCombat(Unit* /*who*/) override { _EnterCombat(); }
+ void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); }
void JustDied(Unit* /*killer*/) override { _JustDied(); }
void JustReachedHome() override { _JustReachedHome(); }
@@ -363,7 +363,7 @@ class TC_GAME_API BossAI : public ScriptedAI
protected:
void _Reset();
- void _EnterCombat();
+ void _JustEngagedWith();
void _JustDied();
void _JustReachedHome();
void _DespawnAtEvade(Seconds delayToRespawn, Creature* who = nullptr);
@@ -397,12 +397,12 @@ class TC_GAME_API WorldBossAI : public ScriptedAI
virtual void ExecuteEvent(uint32 /*eventId*/) { }
void Reset() override { _Reset(); }
- void EnterCombat(Unit* /*who*/) override { _EnterCombat(); }
+ void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); }
void JustDied(Unit* /*killer*/) override { _JustDied(); }
protected:
void _Reset();
- void _EnterCombat();
+ void _JustEngagedWith();
void _JustDied();
EventMap events;