diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Utilities/EventProcessor.cpp | 12 | ||||
| -rw-r--r-- | src/common/Utilities/EventProcessor.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/common/Utilities/EventProcessor.cpp b/src/common/Utilities/EventProcessor.cpp index e48b622822d..3789810787d 100644 --- a/src/common/Utilities/EventProcessor.cpp +++ b/src/common/Utilities/EventProcessor.cpp @@ -110,24 +110,24 @@ void EventProcessor::KillAllEvents(bool force) m_events.clear(); } -void EventProcessor::AddEvent(BasicEvent* event, uint64 e_time, bool set_addtime) +void EventProcessor::AddEvent(BasicEvent* event, Milliseconds e_time, bool set_addtime) { if (set_addtime) event->m_addTime = m_time; - event->m_execTime = e_time; - m_events.insert(std::pair<uint64, BasicEvent*>(e_time, event)); + event->m_execTime = e_time.count(); + m_events.insert(std::pair<uint64, BasicEvent*>(e_time.count(), event)); } -void EventProcessor::ModifyEventTime(BasicEvent* event, uint64 newTime) +void EventProcessor::ModifyEventTime(BasicEvent* event, Milliseconds newTime) { for (auto itr = m_events.begin(); itr != m_events.end(); ++itr) { if (itr->second != event) continue; - event->m_execTime = newTime; + event->m_execTime = newTime.count(); m_events.erase(itr); - m_events.insert(std::pair<uint64, BasicEvent*>(newTime, event)); + m_events.insert(std::pair<uint64, BasicEvent*>(newTime.count(), event)); break; } } diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h index 1d734aa203f..3a5cea0bd94 100644 --- a/src/common/Utilities/EventProcessor.h +++ b/src/common/Utilities/EventProcessor.h @@ -99,17 +99,17 @@ class TC_COMMON_API EventProcessor void Update(uint32 p_time); void KillAllEvents(bool force); - void AddEvent(BasicEvent* event, uint64 e_time, bool set_addtime = true); - void AddEvent(BasicEvent* event, Milliseconds e_time, bool set_addtime = true) { AddEvent(event, e_time.count(), set_addtime); }; + + void AddEvent(BasicEvent* event, Milliseconds e_time, bool set_addtime = true); template<typename T> - is_lambda_event<T> AddEvent(T&& event, uint64 e_time, bool set_addtime = true) { AddEvent(new LambdaBasicEvent<T>(std::move(event)), e_time, set_addtime); } - void AddEventAtOffset(BasicEvent* event, Milliseconds offset) { AddEvent(event, CalculateTime(offset).count()); } - void AddEventAtOffset(BasicEvent* event, Milliseconds offset, Milliseconds offset2) { AddEvent(event, CalculateTime(randtime(offset, offset2)).count()); } + is_lambda_event<T> AddEvent(T&& event, Milliseconds e_time, bool set_addtime = true) { AddEvent(new LambdaBasicEvent<T>(std::move(event)), e_time, set_addtime); } + void AddEventAtOffset(BasicEvent* event, Milliseconds offset) { AddEvent(event, CalculateTime(offset)); } + void AddEventAtOffset(BasicEvent* event, Milliseconds offset, Milliseconds offset2) { AddEvent(event, CalculateTime(randtime(offset, offset2))); } template<typename T> is_lambda_event<T> AddEventAtOffset(T&& event, Milliseconds offset) { AddEventAtOffset(new LambdaBasicEvent<T>(std::move(event)), offset); } template<typename T> is_lambda_event<T> AddEventAtOffset(T&& event, Milliseconds offset, Milliseconds offset2) { AddEventAtOffset(new LambdaBasicEvent<T>(std::move(event)), offset, offset2); } - void ModifyEventTime(BasicEvent* event, uint64 newTime); + void ModifyEventTime(BasicEvent* event, Milliseconds newTime); Milliseconds CalculateTime(Milliseconds t_offset) const { return Milliseconds(m_time) + t_offset; } std::multimap<uint64, BasicEvent*> const& GetEvents() const { return m_events; } |