Move state-owned timed events to generic processor list

Author: Foereaper

ElunaEventMgr.cpp

@@ -20,17 +20,15 @@ extern "C"
 
 ElunaEventProcessor::ElunaEventProcessor(Eluna* _E, WorldObject* _obj) : m_time(0), obj(_obj), E(_E)
 {
-    if (obj)
+    if (E->eventMgr)
         E->eventMgr->processors.insert(this);
 }
 
 ElunaEventProcessor::~ElunaEventProcessor()
 {
-    {
-        RemoveEvents_internal();
-    }
+    RemoveEvents_internal();
 
-    if (obj)
+    if (E->eventMgr)
         E->eventMgr->processors.erase(this);
 }
 
@@ -187,43 +185,45 @@ void ElunaEventProcessor::ProcessDeferredOps()
 
 EventMgr::EventMgr(Eluna* _E) : E(_E)
 {
-    globalProcessor = std::make_unique<ElunaEventProcessor>(E, nullptr);
+    auto gp = std::make_unique<ElunaEventProcessor>(E, nullptr);
+    processors.insert(gp.get());
+    globalProcessors.emplace(GLOBAL_EVENTS, std::move(gp));
 }
 
 EventMgr::~EventMgr()
 {
     for (auto* processor : processors)
         processor->RemoveEvents_internal();
 
-    globalProcessor->RemoveEvents_internal();
+    globalProcessors.clear();
 }
 
 void EventMgr::UpdateProcessors(uint32 diff)
 {
-    if (!processors.empty())
-    {
-        // iterate a copy because processors may be destroyed during update (creature removed by a script, etc)
-        ProcessorSet copy = processors;
+    // iterate a copy because processors may be destroyed during update (creature removed by a script, etc)
+    ProcessorSet copy = processors;
 
-        for (auto* processor : copy)
+    for (auto* processor : copy)
+    {
+        if (processors.find(processor) != processors.end())
             processor->Update(diff);
     }
-
-    globalProcessor->Update(diff);
 }
 
 void EventMgr::SetStates(LuaEventState state)
 {
     for (auto* processor : processors)
         processor->SetStates(state);
-
-    globalProcessor->SetStates(state);
 }
 
 void EventMgr::SetState(int eventId, LuaEventState state)
 {
     for (auto* processor : processors)
         processor->SetState(eventId, state);
+}
 
-    globalProcessor->SetState(eventId, state);
+ElunaEventProcessor* EventMgr::GetGlobalProcessor(GlobalEventSpace space)
+{
+    auto it = globalProcessors.find(space);
+    return (it != globalProcessors.end()) ? it->second.get() : nullptr;
 }

ElunaEventMgr.h

@@ -36,6 +36,11 @@ enum LuaEventState
     LUAEVENT_STATE_ERASE,  // On next call just erases the data
 };
 
+enum GlobalEventSpace
+{
+    GLOBAL_EVENTS
+};
+
 struct LuaEvent
 {
     LuaEvent(int _funcRef, uint32 _min, uint32 _max, uint32 _repeats) :
@@ -116,23 +121,24 @@ class ElunaEventProcessor
 class EventMgr
 {
 public:
-    typedef std::unordered_set<ElunaEventProcessor*> ProcessorSet;
-    ProcessorSet processors;
-    std::unique_ptr<ElunaEventProcessor> globalProcessor;
-    Eluna* E;
-
     EventMgr(Eluna* _E);
     ~EventMgr();
 
-    // Set the state of all timed events
-    // Execute only in safe env
+    void UpdateProcessors(uint32 diff);
     void SetStates(LuaEventState state);
-
-    // Sets the eventId's state in all processors
-    // Execute only in safe env
     void SetState(int eventId, LuaEventState state);
 
-    void UpdateProcessors(uint32 diff);
+    ElunaEventProcessor* GetGlobalProcessor(GlobalEventSpace space);
+
+private:
+    typedef std::unordered_set<ElunaEventProcessor*> ProcessorSet;
+
+    ProcessorSet processors; // tracks ALL processors (object + global)
+    std::unordered_map<GlobalEventSpace, std::unique_ptr<ElunaEventProcessor>> globalProcessors;
+
+    Eluna* E;
+
+    friend class ElunaEventProcessor;
 };
 
 #endif

methods/TrinityCore/GlobalMethods.h

@@ -1594,7 +1594,7 @@ namespace LuaGlobalFunctions
         int functionRef = luaL_ref(E->L, LUA_REGISTRYINDEX);
         if (functionRef != LUA_REFNIL && functionRef != LUA_NOREF)
         {
-            E->eventMgr->globalProcessor->AddEvent(functionRef, min, max, repeats);
+            E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->AddEvent(functionRef, min, max, repeats);
             E->Push(functionRef);
         }
         return 1;
@@ -1615,7 +1615,7 @@ namespace LuaGlobalFunctions
         if (all_Events)
             E->eventMgr->SetState(eventId, LUAEVENT_STATE_ABORT);
         else
-            E->eventMgr->globalProcessor->SetState(eventId, LUAEVENT_STATE_ABORT);
+            E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
     }
 
@@ -1632,7 +1632,7 @@ namespace LuaGlobalFunctions
         if (all_Events)
             E->eventMgr->SetStates(LUAEVENT_STATE_ABORT);
         else
-            E->eventMgr->globalProcessor->SetStates(LUAEVENT_STATE_ABORT);
+            E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetStates(LUAEVENT_STATE_ABORT);
         return 0;
     }