From 27c1f475987bee079bb0bb616b6028d346d3b1b6 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Sat, 25 Jul 2020 16:46:43 +0200 Subject: EventMap: Change GetTimeUntilEvent to return std::chrono types (cherry picked from commit 8cb35b0d5f1462387033e6bd2f99d0ea829fdcd8) --- src/common/Utilities/EventMap.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common/Utilities/EventMap.cpp') diff --git a/src/common/Utilities/EventMap.cpp b/src/common/Utilities/EventMap.cpp index 917ef02b575..e4a1b447579 100644 --- a/src/common/Utilities/EventMap.cpp +++ b/src/common/Utilities/EventMap.cpp @@ -146,11 +146,11 @@ void EventMap::CancelEventGroup(uint32 group) } } -uint32 EventMap::GetTimeUntilEvent(uint32 eventId) const +Milliseconds EventMap::GetTimeUntilEvent(uint32 eventId) const { for (std::pair const& itr : _eventMap) if (eventId == (itr.second & 0x0000FFFF)) - return std::chrono::duration_cast((itr.first - _time)).count(); + return std::chrono::duration_cast(itr.first - _time); - return std::numeric_limits::max(); + return Milliseconds::max(); } -- cgit v1.2.3