PR cleanup

Author: Foereaper

ElunaEventMgr.cpp

@@ -18,22 +18,19 @@ extern "C"
 #include "lauxlib.h"
 };
 
-ElunaEventProcessor::ElunaEventProcessor(Eluna* _E, WorldObject* _obj) : m_time(0), obj(_obj), E(_E)
-{
-}
-
 ElunaEventProcessor::~ElunaEventProcessor()
 {
-    RemoveEvents_internal();
+    ClearAllEvents();
 }
 
 void ElunaEventProcessor::Update(uint32 diff)
 {
     isUpdating = true;
 
     m_time += diff;
-    for (EventList::iterator it = eventList.begin(); it != eventList.end() && it->first <= m_time; it = eventList.begin())
+    while (!eventList.empty() && eventList.begin()->first <= m_time)
     {
+        auto it = eventList.begin();
         LuaEvent* luaEvent = it->second;
         eventList.erase(it);
 
@@ -47,13 +44,15 @@ void ElunaEventProcessor::Update(uint32 diff)
             if (!remove)
                 AddEvent(luaEvent); // may be deferred if we recurse into Update
 
+            // Call the timed event
             if (!obj || (obj && obj->IsInWorld()))
-                E->OnTimedEvent(luaEvent->funcRef, delay, luaEvent->repeats ? luaEvent->repeats-- : luaEvent->repeats, obj);
+                mgr->E->OnTimedEvent(luaEvent->funcRef, delay, luaEvent->repeats ? luaEvent->repeats-- : luaEvent->repeats, obj);
 
             if (!remove)
                 continue;
         }
 
+        // Event should be deleted (executed last time or set to be aborted)
         RemoveEvent(luaEvent);
     }
 
@@ -76,7 +75,7 @@ void ElunaEventProcessor::SetStates(LuaEventState state)
         eventMap.clear();
 }
 
-void ElunaEventProcessor::RemoveEvents_internal()
+void ElunaEventProcessor::ClearAllEvents()
 {
     if (isUpdating)
     {
@@ -117,7 +116,7 @@ void ElunaEventProcessor::AddEvent(LuaEvent* luaEvent)
     }
 
     luaEvent->GenerateDelay();
-    eventList.insert(std::make_pair(m_time + luaEvent->delay, luaEvent));
+    eventList.emplace(m_time + luaEvent->delay, luaEvent);
     eventMap[luaEvent->funcRef] = luaEvent;
 }
 
@@ -129,10 +128,10 @@ void ElunaEventProcessor::AddEvent(int funcRef, uint32 min, uint32 max, uint32 r
 void ElunaEventProcessor::RemoveEvent(LuaEvent* luaEvent)
 {
     // Unreference if should and if Eluna was not yet uninitialized and if the lua state still exists
-    if (luaEvent->state != LUAEVENT_STATE_ERASE && E->HasLuaState())
+    if (luaEvent->state != LUAEVENT_STATE_ERASE && mgr->E->HasLuaState())
     {
         // Free lua function ref
-        luaL_unref(E->L, LUA_REGISTRYINDEX, luaEvent->funcRef);
+        luaL_unref(mgr->E->L, LUA_REGISTRYINDEX, luaEvent->funcRef);
     }
     delete luaEvent;
 }
@@ -172,7 +171,7 @@ void ElunaEventProcessor::ProcessDeferredOps()
             break;
 
         case DeferredOpType::ClearAll:
-            RemoveEvents_internal();
+            ClearAllEvents();
             break;
         }
     }
@@ -186,7 +185,7 @@ ElunaProcessorInfo::~ElunaProcessorInfo()
 
 EventMgr::EventMgr(Eluna* _E) : E(_E)
 {
-    auto gp = std::make_unique<ElunaEventProcessor>(E, nullptr);
+    auto gp = std::make_unique<ElunaEventProcessor>(this, nullptr);
     processors.insert(gp.get());
     globalProcessors.emplace(GLOBAL_EVENTS, std::move(gp));
 }
@@ -235,7 +234,7 @@ ElunaEventProcessor* EventMgr::GetGlobalProcessor(GlobalEventSpace space)
 uint64 EventMgr::CreateObjectProcessor(WorldObject* obj)
 {
     uint64 id = obj->GetGUID().GetRawValue();
-    auto proc = std::make_unique<ElunaEventProcessor>(E, obj);
+    auto proc = std::make_unique<ElunaEventProcessor>(this, obj);
     ElunaEventProcessor* raw = proc.get();
 
     processors.insert(raw);

ElunaEventMgr.h

@@ -43,10 +43,7 @@ enum GlobalEventSpace
 
 struct LuaEvent
 {
-    LuaEvent(int _funcRef, uint32 _min, uint32 _max, uint32 _repeats) :
-        min(_min), max(_max), delay(0), repeats(_repeats), funcRef(_funcRef), state(LUAEVENT_STATE_RUN)
-    {
-    }
+    LuaEvent(int _funcRef, uint32 _min, uint32 _max, uint32 _repeats) : min(_min), max(_max), delay(0), repeats(_repeats), funcRef(_funcRef), state(LUAEVENT_STATE_RUN) { }
 
     void SetState(LuaEventState _state)
     {
@@ -75,7 +72,7 @@ class ElunaEventProcessor
     typedef std::multimap<uint64, LuaEvent*> EventList;
     typedef std::unordered_map<int, LuaEvent*> EventMap;
 
-    ElunaEventProcessor(Eluna* _E, WorldObject* _obj);
+    ElunaEventProcessor(EventMgr* mgr, WorldObject* obj) : m_time(0), obj(obj), mgr(mgr) { }
     ~ElunaEventProcessor();
 
     void Update(uint32 diff);
@@ -102,7 +99,7 @@ class ElunaEventProcessor
         LuaEventState state = LUAEVENT_STATE_RUN;
     };
 
-    void RemoveEvents_internal();
+    void ClearAllEvents();
     void AddEvent(LuaEvent* luaEvent);
     void RemoveEvent(LuaEvent* luaEvent);
 
@@ -118,17 +115,13 @@ class ElunaEventProcessor
     bool pendingDeletion = false;
 
     WorldObject* obj;
-    Eluna* E;
+    EventMgr* mgr;
 };
 
 class ElunaProcessorInfo
 {
 public:
-    ElunaProcessorInfo(EventMgr* mgr, uint64 processorId)
-        : mgr(mgr), processorId(processorId)
-    {
-    }
-
+    ElunaProcessorInfo(EventMgr* mgr, uint64 processorId) : mgr(mgr), processorId(processorId) { }
     ~ElunaProcessorInfo();
 
     uint64 GetProcessorId() const { return processorId; }
@@ -148,9 +141,10 @@ class EventMgr
     void SetAllEventStates(LuaEventState state);
     void SetEventState(int eventId, LuaEventState state);
 
+    // Global (per state) processors
     ElunaEventProcessor* GetGlobalProcessor(GlobalEventSpace space);
 
-    // Per-object processors (keyed by internal processorId)
+    // Per-object processors
     uint64 CreateObjectProcessor(WorldObject* obj);
     ElunaEventProcessor* GetObjectProcessor(uint64 processorId);
     void FlagObjectProcessorForDeletion(uint64 processorId);