diff options
| author | Carbenium <carbenium@outlook.com> | 2020-07-25 23:07:29 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-24 12:00:35 +0100 |
| commit | eeffb310de3f91a1c456a3c118eb01311557a00b (patch) | |
| tree | a2d50e5d6a560d58008fa834767a316c49f19efa /src/server/scripts/Kalimdor | |
| parent | 310f996b1daf9dea701276847aa3fb30fcd43b9e (diff) | |
Core/EventProcessor: std::chrono-ify CalculateTime
uint64 CalculateTime(uint64 t_offset) has been replaced with Milliseconds CalculateTime(Milliseconds t_offset).
Also add the std::chrono-ified overload void AddEvent(BasicEvent*, Milliseconds, bool)
(cherry picked from commit 92a02a5c8750913f596d7e3b58bf8439cb770c28)
Diffstat (limited to 'src/server/scripts/Kalimdor')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 54dd507f062..f8b76beec94 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -469,7 +469,7 @@ class npc_egg_pile : public CreatureScript Creature* egg = Trinity::Containers::SelectRandomContainerElement(eggs); egg->CastSpell(egg, SPELL_SUMMON_SMOULDERING_HATCHLING, TRIGGERED_FULL_MASK); egg->SetDisplayId(MODEL_INVISIBLE_STALKER); - egg->m_Events.AddEvent(new RespawnEggEvent(egg), egg->m_Events.CalculateTime(5000)); + egg->m_Events.AddEventAtOffset(new RespawnEggEvent(egg), 5s); } if (_callHatchlingSpell) diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.cpp b/src/server/scripts/Kalimdor/Firelands/firelands.cpp index a0071f85800..3bb16bd696e 100644 --- a/src/server/scripts/Kalimdor/Firelands/firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/firelands.cpp @@ -63,8 +63,8 @@ void firelands_bossAI::JustDied(Unit* killer) { BossAI::JustDied(killer); instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); - me->m_Events.AddEvent(new DelayedSpellCastEvent(me, static_cast<Unit*>(nullptr), SPELL_SMOULDERING_1, false), me->m_Events.CalculateTime(2 * IN_MILLISECONDS)); - me->m_Events.AddEvent(new DelayedSpellCastEvent(me, static_cast<Unit*>(nullptr), SPELL_SMOULDERING_2, false), me->m_Events.CalculateTime(2 * IN_MILLISECONDS)); + me->m_Events.AddEventAtOffset(new DelayedSpellCastEvent(me, static_cast<Unit*>(nullptr), SPELL_SMOULDERING_1, false), 2s); + me->m_Events.AddEventAtOffset(new DelayedSpellCastEvent(me, static_cast<Unit*>(nullptr), SPELL_SMOULDERING_2, false), 2s); } void firelands_bossAI::EnterEvadeMode(EvadeReason why) diff --git a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp index 73bcc1d79d3..57a03c08668 100644 --- a/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp @@ -41,7 +41,7 @@ class instance_firelands : public InstanceMapScript { case NPC_SMOULDERING_HATCHLING: // Cannot directly start attacking here as the creature is not yet on map - creature->m_Events.AddEvent(new DelayedAttackStartEvent(creature), creature->m_Events.CalculateTime(500)); + creature->m_Events.AddEventAtOffset(new DelayedAttackStartEvent(creature), 500ms); break; case NPC_BALEROC: BalerocGUID = creature->GetGUID(); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index b4ae4188b1a..9fedc46477c 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -150,7 +150,7 @@ public: stalkers.remove((*itr)); // Remove it to prevent a single trigger from spawning multiple npcs. (*itr)->CastSpell((*itr), SPELL_BEETLE_BURROW); // Cast visual // Summon after 5 seconds. - (*itr)->m_Events.AddEvent(new SummonScarab((*itr), instance), (*itr)->m_Events.CalculateTime(5000)); + (*itr)->m_Events.AddEventAtOffset(new SummonScarab((*itr), instance), 5s); } Trinity::Containers::RandomResize(stalkers, 2); // Holds the summoners of Dustbone Horror |