diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Utilities/EventMap.cpp | 6 | ||||
| -rw-r--r-- | src/common/Utilities/EventMap.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/Utilities/EventMap.cpp b/src/common/Utilities/EventMap.cpp index 1a227c8a874..de3400b403f 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<TimePoint const, uint32> const& itr : _eventMap) if (eventId == (itr.second & 0x0000FFFF)) - return std::chrono::duration_cast<Milliseconds>((itr.first - _time)).count(); + return std::chrono::duration_cast<Milliseconds>(itr.first - _time); - return std::numeric_limits<uint32>::max(); + return Milliseconds::max(); } diff --git a/src/common/Utilities/EventMap.h b/src/common/Utilities/EventMap.h index dbb297a1c63..37e4fcb0bfb 100644 --- a/src/common/Utilities/EventMap.h +++ b/src/common/Utilities/EventMap.h @@ -219,11 +219,11 @@ public: /** * @name GetTimeUntilEvent - * @brief Returns time in milliseconds until next event. + * @brief Returns time as std::chrono type until next event. * @param eventId of the event. - * @return Time of next event. + * @return Time of next event. If event is not scheduled returns Milliseconds::max() */ - uint32 GetTimeUntilEvent(uint32 eventId) const; + Milliseconds GetTimeUntilEvent(uint32 eventId) const; private: /** |