From da438c73e222b76e44885e1e53937bca8710f6fe Mon Sep 17 00:00:00 2001 From: Carbenium Date: Sat, 25 Jul 2020 20:46:24 +0200 Subject: Core/BossAI: Remove _DespawnAtEvade(uint32, Creature*) overload Use _DespawnAtEvade(Seconds, Creature*) instead (cherry picked from commit 27229c10cd6813e69ea6db69384312b1854b2b57) --- src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 4 ++-- src/server/game/AI/ScriptedAI/ScriptedCreature.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/server/game/AI/ScriptedAI') diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index c67b1ba81d4..8c5a51eed00 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -599,10 +599,10 @@ bool BossAI::CanAIAttack(Unit const* target) const 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 " SI64FMTD " seconds, defaulting to 2 (me: %s)", delayToRespawn.count(), me->GetGUID().ToString().c_str()); - delayToRespawn = Seconds(2); + delayToRespawn = 2s; } if (!who) diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 36849b37025..eeeba10a21d 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -340,8 +340,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(); -- cgit v1.2.3