aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2020-07-14 01:35:25 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-23 21:36:03 +0100
commitd11c3807b32d51e48ed4557972a627f6366956d9 (patch)
tree3a551793088ff8b7d1475cc1045fbab811b94188 /src/server/scripts
parentdfc1f08bd84503f6023d033396fc33d356220a62 (diff)
Core/Time: Rename GetGameTime{System, Steady}Point methods
The names are a bit unhandy. Rename them (shorter but still meaningful). GetGameTimeSystemPoint() -> GetSystemTime() GetGameTimeSteadyPoint() -> Now() Also add 2 new typedefs: typedef std::chrono::steady_clock::time_point TimePoint; typedef std::chrono::system_clock::time_point SystemTimePoint; Closes #25042 (cherry picked from commit 896b68d5c297b06587645caebc98b704978ecaa7)
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index 6017fc7c126..377c7b4f6b3 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -848,7 +848,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
_controller.SetTransport(creature->GetTransport());
me->SetRegenerateHealth(false);
me->m_CombatDistance = 70.0f;
- _firstMageCooldown = GameTime::GetGameTimeSteadyPoint() + 60s;
+ _firstMageCooldown = GameTime::Now() + 60s;
_axethrowersYellCooldown = time_t(0);
_rocketeersYellCooldown = time_t(0);
}
@@ -858,7 +858,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
ScriptedAI::InitializeAI();
_events.Reset();
- _firstMageCooldown = GameTime::GetGameTimeSteadyPoint() + 60s;
+ _firstMageCooldown = GameTime::Now() + 60s;
_axethrowersYellCooldown = time_t(0);
_rocketeersYellCooldown = time_t(0);
}
@@ -910,7 +910,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
}
else if (action == ACTION_SPAWN_MAGE)
{
- std::chrono::steady_clock::time_point now = GameTime::GetGameTimeSteadyPoint();
+ TimePoint now = GameTime::Now();
if (_firstMageCooldown > now)
_events.ScheduleEvent(EVENT_SUMMON_MAGE, std::chrono::duration_cast<Milliseconds>(_firstMageCooldown - now));
else
@@ -1087,7 +1087,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
EventMap _events;
PassengerController _controller;
InstanceScript* _instance;
- std::chrono::steady_clock::time_point _firstMageCooldown;
+ TimePoint _firstMageCooldown;
time_t _axethrowersYellCooldown;
time_t _rocketeersYellCooldown;
};
@@ -1112,7 +1112,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
_controller.SetTransport(creature->GetTransport());
me->SetRegenerateHealth(false);
me->m_CombatDistance = 70.0f;
- _firstMageCooldown = GameTime::GetGameTimeSteadyPoint() + 60s;
+ _firstMageCooldown = GameTime::Now() + 60s;
_riflemanYellCooldown = time_t(0);
_mortarYellCooldown = time_t(0);
}
@@ -1122,7 +1122,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
ScriptedAI::InitializeAI();
_events.Reset();
- _firstMageCooldown = GameTime::GetGameTimeSteadyPoint() + 60s;
+ _firstMageCooldown = GameTime::Now() + 60s;
_riflemanYellCooldown = time_t(0);
_mortarYellCooldown = time_t(0);
}
@@ -1174,7 +1174,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
}
else if (action == ACTION_SPAWN_MAGE)
{
- std::chrono::steady_clock::time_point now = GameTime::GetGameTimeSteadyPoint();
+ TimePoint now = GameTime::Now();
if (_firstMageCooldown > now)
_events.ScheduleEvent(EVENT_SUMMON_MAGE, std::chrono::duration_cast<Milliseconds>(_firstMageCooldown - now));
else
@@ -1355,7 +1355,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
EventMap _events;
PassengerController _controller;
InstanceScript* _instance;
- std::chrono::steady_clock::time_point _firstMageCooldown;
+ TimePoint _firstMageCooldown;
time_t _riflemanYellCooldown;
time_t _mortarYellCooldown;
};