diff options
| author | Carbenium <carbenium@outlook.com> | 2020-07-25 23:51:30 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-24 12:06:56 +0100 |
| commit | a7cbb16229cb48057fd8ef38b6db205beeb30b4e (patch) | |
| tree | 9b6dc7ce0a9f0ebbdaf26cfdac2e2c2c814e7687 /src/server | |
| parent | eeffb310de3f91a1c456a3c118eb01311557a00b (diff) | |
Core/EventProcessor: std::chrono-ify the remaining public API
(cherry picked from commit 1d8782e3566393f71fbc091de57c96a9a15972cb)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 7d26474c4c1..d1415153575 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -828,7 +828,7 @@ uint64 Spell::CalculateDelayMomentForDst(float launchDelay) const void Spell::RecalculateDelayMomentForDst() { m_delayMoment = CalculateDelayMomentForDst(0.0f); - m_caster->m_Events.ModifyEventTime(_spellEvent, GetDelayStart() + m_delayMoment); + m_caster->m_Events.ModifyEventTime(_spellEvent, Milliseconds(GetDelayStart() + m_delayMoment)); } void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo, SpellImplicitTargetInfo const& targetType, uint32& processedEffectMask) @@ -7838,7 +7838,7 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time) if (n_offset) { // re-add us to the queue - m_Spell->GetCaster()->m_Events.AddEvent(this, m_Spell->GetDelayStart() + n_offset, false); + m_Spell->GetCaster()->m_Events.AddEvent(this, Milliseconds(m_Spell->GetDelayStart() + n_offset), false); return false; // event not complete } // event complete @@ -7856,7 +7856,7 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time) else ASSERT(n_offset == m_Spell->GetDelayMoment()); // re-plan the event for the delay moment - m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + m_Spell->GetDelayMoment(), false); + m_Spell->GetCaster()->m_Events.AddEvent(this, Milliseconds(e_time + m_Spell->GetDelayMoment()), false); return false; // event not complete } break; @@ -7870,7 +7870,7 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time) } // spell processing not complete, plan event on the next update interval - m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + 1, false); + m_Spell->GetCaster()->m_Events.AddEvent(this, Milliseconds(e_time + 1), false); return false; // event not complete } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 45dadc8122d..0ba329d82a5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -243,7 +243,7 @@ class ActivateLivingConstellation : public BasicEvent return true; // delete event _owner->CastSpell(nullptr, SPELL_TRIGGER_3_ADDS, TRIGGERED_FULL_MASK); - _owner->m_Events.AddEvent(this, execTime + urand(45000, 50000)); + _owner->m_Events.AddEvent(this, Milliseconds(execTime) + randtime(45s, 50s)); return false; } @@ -275,7 +275,7 @@ class SummonUnleashedDarkMatter : public BasicEvent bool Execute(uint64 execTime, uint32 /*diff*/) override { _caster->CastSpell(nullptr, SPELL_SUMMON_UNLEASHED_DARK_MATTER, TRIGGERED_FULL_MASK); - _caster->m_Events.AddEvent(this, execTime + 30000); + _caster->m_Events.AddEvent(this, Milliseconds(execTime) + 30s); return false; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 06ae5f3ac0f..2d523415e21 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -392,7 +392,7 @@ class TrashJumpEvent : public BasicEvent case 0: _owner->CastSpell(nullptr, SPELL_LEAP); ++_stage; - _owner->m_Events.AddEvent(this, eventTime + 2000); + _owner->m_Events.AddEvent(this, Milliseconds(eventTime) + 2s); return false; case 1: _owner->SetReactState(REACT_AGGRESSIVE); @@ -423,7 +423,7 @@ class LightningFieldEvent : public BasicEvent if (instance->GetBossState(BOSS_THORIM) == IN_PROGRESS) { _owner->CastSpell(nullptr, SPELL_LIGHTNING_FIELD); - _owner->m_Events.AddEvent(this, eventTime + 1000); + _owner->m_Events.AddEvent(this, Milliseconds(eventTime) + 1s); return false; } } |
