diff options
| author | Carbenium <carbenium@outlook.com> | 2020-07-25 20:46:24 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 23:28:47 +0100 |
| commit | da438c73e222b76e44885e1e53937bca8710f6fe (patch) | |
| tree | 96407985d4d73f5182642c32934703e2acb83cab /src | |
| parent | 5f296fb7c78b6173a18c0811630dfb62f7a61e32 (diff) | |
Core/BossAI: Remove _DespawnAtEvade(uint32, Creature*) overload
Use _DespawnAtEvade(Seconds, Creature*) instead
(cherry picked from commit 27229c10cd6813e69ea6db69384312b1854b2b57)
Diffstat (limited to 'src')
3 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 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(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index bc66e9eedd6..6636e1ab6aa 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -261,8 +261,8 @@ public: me->GetCreatureListWithEntryInGrid(triggers, NPC_WORLDTRIGGER_LARGE); for (Creature* trigger : triggers) if (trigger->HasAura(SPELL_SUMMON_CHAMPION_PERIODIC) || trigger->HasAura(SPELL_WEB_FRONT_DOORS) || trigger->HasAura(SPELL_WEB_SIDE_DOORS)) - _DespawnAtEvade(25, trigger); - _DespawnAtEvade(25); + _DespawnAtEvade(25s, trigger); + _DespawnAtEvade(25s); summons.DespawnAll(); for (ObjectGuid gNerubian : _anubar) if (Creature* nerubian = ObjectAccessor::GetCreature(*me, gNerubian)) |