diff options
| author | Carbenium <carbenium@outlook.com> | 2020-07-25 20:46:24 +0200 |
|---|---|---|
| committer | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-25 23:11:10 +0200 |
| commit | 27229c10cd6813e69ea6db69384312b1854b2b57 (patch) | |
| tree | 7f689e91287c3f721d060e9b14ddaf3d04cb390f /src/server/game/AI/ScriptedAI | |
| parent | d7ff8c272ad016296e1eed5aae325e4e5058ddd8 (diff) | |
Core/BossAI: Remove _DespawnAtEvade(uint32, Creature*) overload
Use _DespawnAtEvade(Seconds, Creature*) instead
Diffstat (limited to 'src/server/game/AI/ScriptedAI')
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedCreature.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 2addd5f222d..4e1c890ad95 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -593,12 +593,12 @@ bool BossAI::CanAIAttack(Unit const* target) const return IsInBoundary(target); } -void BossAI::_DespawnAtEvade(Seconds delayToRespawn, Creature* who) +void BossAI::_DespawnAtEvade(Seconds delayToRespawn /*= 30s*/, Creature* who /*= nullptr*/) { - if (delayToRespawn < Seconds(2)) + if (delayToRespawn < 2s) { TC_LOG_ERROR("scripts.ai", "BossAI::_DespawnAtEvade: called with delay of %ld seconds, defaulting to 2 (me: %s)", delayToRespawn.count(), me->GetGUID().ToString().c_str()); - delayToRespawn = Seconds(2); + delayToRespawn = 2s; } if (!who) @@ -611,7 +611,7 @@ void BossAI::_DespawnAtEvade(Seconds delayToRespawn, Creature* who) return; } - who->DespawnOrUnsummon(0, Seconds(delayToRespawn)); + who->DespawnOrUnsummon(0, delayToRespawn); if (instance && who == me) instance->SetBossState(_bossId, FAIL); diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 150f3323833..3d0cfcb5440 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -337,8 +337,7 @@ class TC_GAME_API BossAI : public ScriptedAI void _JustEngagedWith(Unit* who); void _JustDied(); void _JustReachedHome(); - void _DespawnAtEvade(Seconds delayToRespawn, Creature* who = nullptr); - void _DespawnAtEvade(uint32 delayToRespawn = 30, Creature* who = nullptr) { _DespawnAtEvade(Seconds(delayToRespawn), who); } + void _DespawnAtEvade(Seconds delayToRespawn = 30s, Creature* who = nullptr); void TeleportCheaters(); |