Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some misc streamlining/cleanup:

Browse Source 
- std::chrono overloads for SummonCreature
- Removed misleading const qualifier from SummonCreature (it wasn't being honored)
- Rename parameters of SummonCreature to follow convention
- EventProcessor has a new method (AddEventAtOffset) that adds an event...at an offset. Genius.

PS: Hi there Keader.
(cherry picked from commit 76a4c7d974)
This commit is contained in:
Treeston
2017-11-30 20:45:44 +01:00
committed by funjoker
parent f1388f37b6
commit 2c0b94a000
4 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/Utilities/EventProcessor.cpp
View File

@@ -110,29 +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, uint64 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_addTime = m_time;
event->m_execTime = e_time;
m_events.insert(std::pair<uint64, BasicEvent*>(e_time, event));
}
void EventProcessor::ModifyEventTime(BasicEvent* Event, uint64 newTime)
void EventProcessor::ModifyEventTime(BasicEvent* event, uint64 newTime)
{
for (auto itr = m_events.begin(); itr != m_events.end(); ++itr)
{
if (itr->second != Event)
if (itr->second != event)
continue;
Event->m_execTime = newTime;
event->m_execTime = newTime;
m_events.erase(itr);
m_events.insert(std::pair<uint64, BasicEvent*>(newTime, Event));
m_events.insert(std::pair<uint64, BasicEvent*>(newTime, event));
break;
}
}
uint64 EventProcessor::CalculateTime(uint64 t_offset) const
{
return(m_time + t_offset);
}