Clean up naming convention and EventMgr destructor

Author: Foereaper

ElunaEventMgr.cpp

@@ -20,15 +20,15 @@ extern "C"
 
 ElunaEventProcessor::ElunaEventProcessor(Eluna* _E, WorldObject* _obj) : m_time(0), obj(_obj), E(_E)
 {
-    if (E->eventMgr)
+    if (E && E->eventMgr)
         E->eventMgr->processors.insert(this);
 }
 
 ElunaEventProcessor::~ElunaEventProcessor()
 {
     RemoveEvents_internal();
 
-    if (E->eventMgr)
+    if (E && E->eventMgr)
         E->eventMgr->processors.erase(this);
 }
 
@@ -192,10 +192,8 @@ EventMgr::EventMgr(Eluna* _E) : E(_E)
 
 EventMgr::~EventMgr()
 {
-    for (auto* processor : processors)
-        processor->RemoveEvents_internal();
-
     globalProcessors.clear();
+    processors.clear();
 }
 
 void EventMgr::UpdateProcessors(uint32 diff)
@@ -210,13 +208,13 @@ void EventMgr::UpdateProcessors(uint32 diff)
     }
 }
 
-void EventMgr::SetStates(LuaEventState state)
+void EventMgr::SetAllEventStates(LuaEventState state)
 {
     for (auto* processor : processors)
         processor->SetStates(state);
 }
 
-void EventMgr::SetState(int eventId, LuaEventState state)
+void EventMgr::SetEventState(int eventId, LuaEventState state)
 {
     for (auto* processor : processors)
         processor->SetState(eventId, state);

ElunaEventMgr.h

@@ -125,8 +125,8 @@ class EventMgr
     ~EventMgr();
 
     void UpdateProcessors(uint32 diff);
-    void SetStates(LuaEventState state);
-    void SetState(int eventId, LuaEventState state);
+    void SetAllEventStates(LuaEventState state);
+    void SetEventState(int eventId, LuaEventState state);
 
     ElunaEventProcessor* GetGlobalProcessor(GlobalEventSpace space);
 

LuaEngine.cpp

@@ -33,7 +33,7 @@ extern void RegisterMethods(Eluna* E);
 void Eluna::_ReloadEluna()
 {
     // Remove all timed events
-    eventMgr->SetStates(LUAEVENT_STATE_ERASE);
+    eventMgr->SetAllEventStates(LUAEVENT_STATE_ERASE);
 
 #if defined ELUNA_TRINITY
     // Cancel all pending async queries

methods/CMangos/GlobalMethods.h

@@ -1619,7 +1619,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetState(eventId, LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetEventState(eventId, LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
@@ -1636,7 +1636,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetStates(LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetAllEventStates(LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetStates(LUAEVENT_STATE_ABORT);
         return 0;

methods/Mangos/GlobalMethods.h

@@ -1413,7 +1413,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetState(eventId, LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetEventState(eventId, LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
@@ -1430,7 +1430,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetStates(LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetAllEventStates(LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetStates(LUAEVENT_STATE_ABORT);
         return 0;

methods/TrinityCore/GlobalMethods.h

@@ -1613,7 +1613,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetState(eventId, LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetEventState(eventId, LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
@@ -1630,7 +1630,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetStates(LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetAllEventStates(LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetStates(LUAEVENT_STATE_ABORT);
         return 0;

methods/VMangos/GlobalMethods.h

@@ -1409,7 +1409,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetState(eventId, LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetEventState(eventId, LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
@@ -1426,7 +1426,7 @@ namespace LuaGlobalFunctions
 
         // not thread safe
         if (all_Events)
-            E->eventMgr->SetStates(LUAEVENT_STATE_ABORT);
+            E->eventMgr->SetAllEventStates(LUAEVENT_STATE_ABORT);
         else
             E->eventMgr->GetGlobalProcessor(GLOBAL_EVENTS)->SetStates(LUAEVENT_STATE_ABORT);
         return 0;