From 6ab9922171cf6e2877c39f503bcf987dd9faa898 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Wed, 22 Jul 2020 16:09:32 +0200 Subject: EventMap: Remove GetNextEventTime and GetTimer methods (PR #25092) --- src/common/Utilities/EventMap.cpp | 12 ------------ src/common/Utilities/EventMap.h | 26 -------------------------- 2 files changed, 38 deletions(-) (limited to 'src') diff --git a/src/common/Utilities/EventMap.cpp b/src/common/Utilities/EventMap.cpp index a29861e4574..142b5b85220 100644 --- a/src/common/Utilities/EventMap.cpp +++ b/src/common/Utilities/EventMap.cpp @@ -146,18 +146,6 @@ void EventMap::CancelEventGroup(uint32 group) } } -uint32 EventMap::GetNextEventTime(uint32 eventId) const -{ - if (Empty()) - return 0; - - for (std::pair const& itr : _eventMap) - if (eventId == (itr.second & 0x0000FFFF)) - return itr.first; - - return 0; -} - uint32 EventMap::GetTimeUntilEvent(uint32 eventId) const { for (std::pair const& itr : _eventMap) diff --git a/src/common/Utilities/EventMap.h b/src/common/Utilities/EventMap.h index e2ccac945df..a9f864267f9 100644 --- a/src/common/Utilities/EventMap.h +++ b/src/common/Utilities/EventMap.h @@ -56,15 +56,6 @@ public: _time += time; } - /** - * @name GetTimer - * @return Current timer value in ms. - */ - uint32 GetTimer() const - { - return _time; - } - /** * @name GetPhaseMask * @return Active phases as mask. @@ -205,23 +196,6 @@ public: */ void CancelEventGroup(uint32 group); - /** - * @name GetNextEventTime - * @brief Returns closest occurrence of specified event. - * @param eventId Wanted event id. - * @return Time of found event. - */ - uint32 GetNextEventTime(uint32 eventId) const; - - /** - * @name GetNextEventTime - * @return Time of next event. - */ - uint32 GetNextEventTime() const - { - return Empty() ? 0 : _eventMap.begin()->first; - } - /** * @name IsInPhase * @brief Returns whether event map is in specified phase or not. -- cgit v1.2.3