diff options
author | Treeston <treeston.mmoc@gmail.com> | 2020-07-14 01:35:25 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 21:36:03 +0100 |
commit | d11c3807b32d51e48ed4557972a627f6366956d9 (patch) | |
tree | 3a551793088ff8b7d1475cc1045fbab811b94188 /src/server/game/Handlers | |
parent | dfc1f08bd84503f6023d033396fc33d356220a62 (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/game/Handlers')
-rw-r--r-- | src/server/game/Handlers/AuctionHouseHandler.cpp | 6 | ||||
-rw-r--r-- | src/server/game/Handlers/GuildHandler.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Handlers/QueryHandler.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index e5d0c4b51ab..758e0989af0 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -182,7 +182,7 @@ void WorldSession::HandleAuctionGetCommodityQuote(WorldPackets::AuctionHouse::Au { commodityQuoteResult.TotalPrice = quote->TotalPrice; commodityQuoteResult.Quantity = quote->Quantity; - commodityQuoteResult.QuoteDuration = std::chrono::duration_cast<Milliseconds>(quote->ValidTo - GameTime::GetGameTimeSteadyPoint()); + commodityQuoteResult.QuoteDuration = std::chrono::duration_cast<Milliseconds>(quote->ValidTo - GameTime::Now()); } commodityQuoteResult.ItemID = getCommodityQuote.ItemID; @@ -695,7 +695,7 @@ void WorldSession::HandleAuctionSellCommodity(WorldPackets::AuctionHouse::Auctio auction.OwnerAccount = GetAccountGUID(); auction.BuyoutOrUnitPrice = sellCommodity.UnitPrice; auction.Deposit = deposit; - auction.StartTime = GameTime::GetGameTimeSystemPoint(); + auction.StartTime = GameTime::GetSystemTime(); auction.EndTime = auction.StartTime + auctionTime; // keep track of what was cloned to undo/modify counts later @@ -890,7 +890,7 @@ void WorldSession::HandleAuctionSellItem(WorldPackets::AuctionHouse::AuctionSell auction.BuyoutOrUnitPrice = sellItem.BuyoutPrice; auction.Deposit = deposit; auction.BidAmount = sellItem.MinBid; - auction.StartTime = GameTime::GetGameTimeSystemPoint(); + auction.StartTime = GameTime::GetSystemTime(); auction.EndTime = auction.StartTime + auctionTime; if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE)) diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 1e4cf28ed9e..8c82e3ae0e7 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -550,7 +550,7 @@ void WorldSession::HandleRequestGuildRewardsList(WorldPackets::Guild::RequestGui std::vector<GuildReward> const& rewards = sGuildMgr->GetGuildRewards(); WorldPackets::Guild::GuildRewardList rewardList; - rewardList.Version = GameTime::GetGameTimeSystemPoint(); + rewardList.Version = GameTime::GetSystemTime(); rewardList.RewardItems.reserve(rewards.size()); for (uint32 i = 0; i < rewards.size(); i++) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 06dc63a9e00..07b23c7d6db 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1058,7 +1058,7 @@ void WorldSession::HandleGuildSetFocusedAchievement(WorldPackets::Achievement::G void WorldSession::HandleServerTimeOffsetRequest(WorldPackets::Misc::ServerTimeOffsetRequest& /*request*/) { WorldPackets::Misc::ServerTimeOffset response; - response.Time = GameTime::GetGameTimeSystemPoint(); + response.Time = GameTime::GetSystemTime(); SendPacket(response.Write()); } diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index eca0a1e7556..4bfb1962c89 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -60,7 +60,7 @@ void WorldSession::HandleQueryTimeOpcode(WorldPackets::Query::QueryTime& /*query void WorldSession::SendQueryTimeResponse() { WorldPackets::Query::QueryTimeResponse queryTimeResponse; - queryTimeResponse.CurrentTime = GameTime::GetGameTimeSystemPoint(); + queryTimeResponse.CurrentTime = GameTime::GetSystemTime(); SendPacket(queryTimeResponse.Write()); } |