diff options
| author | DanVS <33371360+DanVS@users.noreply.github.com> | 2018-09-17 16:38:22 +0000 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-11-09 00:26:59 +0100 |
| commit | 28cb2af1c5dbaf9b3644a7919edc1603f0d75dbf (patch) | |
| tree | 2d45d4a3d9713307418cc3a5dbef49306d090542 /src/server/scripts/Events | |
| parent | e8e8e4b9d6ae72615334c5ef5f62d14a77729f55 (diff) | |
Core/Scripts: Unify Chrono Literals (#22420)
* Unify Chrono Literals
* Retire IN_MILLISECONDS
* Build fix
* Build fix (sequel)
* Retire urand()
* Edge cases
* Build
* Whitespaces
* More edge cases
* Additional cases
(cherry picked from commit 5b0f4009df4cde413c92c73467ca9a63e79a772b)
Diffstat (limited to 'src/server/scripts/Events')
| -rw-r--r-- | src/server/scripts/Events/fireworks_show.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/server/scripts/Events/fireworks_show.cpp b/src/server/scripts/Events/fireworks_show.cpp index 2d4b9e2ab0b..c3e1d09a06c 100644 --- a/src/server/scripts/Events/fireworks_show.cpp +++ b/src/server/scripts/Events/fireworks_show.cpp @@ -804,15 +804,15 @@ public: // Start if ((localTm.tm_min == 0 && localTm.tm_sec == 0) && !_started && (IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR) || IsEventActive(GAME_EVENT_NEW_YEAR))) { - _events.ScheduleEvent(EVENT_CHEER, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); + _events.ScheduleEvent(EVENT_CHEER, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); _started = true; } // Event is active if ((localTm.tm_min >= 0 && localTm.tm_sec >= 1 && localTm.tm_min <= 9 && localTm.tm_sec <= 59 && !_started) && (IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR) || IsEventActive(GAME_EVENT_NEW_YEAR))) { - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); + _events.ScheduleEvent(EVENT_FIRE, 1s); _started = true; } @@ -820,7 +820,7 @@ public: if ((localTm.tm_min == 10 && localTm.tm_sec == 0) && _started == true) { _started = false; - _events.ScheduleEvent(EVENT_CHEER, Seconds(1)); + _events.ScheduleEvent(EVENT_CHEER, 1s); _events.CancelEvent(EVENT_FIRE); } @@ -828,17 +828,17 @@ public: if ((localTm.tm_min == 10 && localTm.tm_sec == 30 && localTm.tm_hour == 0) && IsEventActive(GAME_EVENT_NEW_YEAR) && _big == true) { _big = false; - _events.ScheduleEvent(EVENT_CHEER, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); - _events.ScheduleEvent(EVENT_FIRE, Seconds(1)); + _events.ScheduleEvent(EVENT_CHEER, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); + _events.ScheduleEvent(EVENT_FIRE, 1s); } while (uint32 eventId = _events.ExecuteEvent()) @@ -877,7 +877,7 @@ public: } if (_started == true) - _events.ScheduleEvent(EVENT_FIRE, Seconds(1), Seconds(2)); + _events.ScheduleEvent(EVENT_FIRE, 1s, 2s); break; } |