PR cleanup 2

Author: Foereaper

ElunaEventMgr.cpp

@@ -151,29 +151,18 @@ void ElunaEventProcessor::ProcessDeferredOps()
     if (deferredOps.empty())
         return;
 
-    std::vector<DeferredOp> ops;
-    ops.swap(deferredOps);
-
-    for (DeferredOp& op : ops)
+    using Handler = void(*)(ElunaEventProcessor*, DeferredOp&);
+    static constexpr Handler handlers[] =
     {
-        switch (op.type)
-        {
-        case DeferredOpType::AddEvent:
-            AddEvent(op.event);
-            break;
-
-        case DeferredOpType::SetState:
-            SetState(op.eventId, op.state);
-            break;
+        [](ElunaEventProcessor* self, DeferredOp& op)     { self->AddEvent(op.event); },
+        [](ElunaEventProcessor* self, DeferredOp& op)     { self->SetState(op.eventId, op.state); },
+        [](ElunaEventProcessor* self, DeferredOp& op)     { self->SetStates(op.state); },
+        [](ElunaEventProcessor* self, DeferredOp& /*op*/) { self->ClearAllEvents(); }
+    };
 
-        case DeferredOpType::SetStates:
-            SetStates(op.state);
-            break;
-
-        case DeferredOpType::ClearAll:
-            ClearAllEvents();
-            break;
-        }
+    for (DeferredOp& op : deferredOps)
+    {
+        handlers[op.type](this, op);
     }
 }
 

ElunaEventMgr.h

@@ -29,14 +29,22 @@ class EventMgr;
 class ElunaEventProcessor;
 class WorldObject;
 
-enum LuaEventState
+enum LuaEventState : uint8
 {
     LUAEVENT_STATE_RUN,    // On next call run the function normally
     LUAEVENT_STATE_ABORT,  // On next call unregisters reffed function and erases the data
     LUAEVENT_STATE_ERASE,  // On next call just erases the data
 };
 
-enum GlobalEventSpace
+enum DeferredOpType : uint8
+{
+    AddEvent,
+    SetState,
+    SetStates,
+    ClearAll
+};
+
+enum GlobalEventSpace : uint8
 {
     GLOBAL_EVENTS
 };
@@ -83,20 +91,12 @@ class ElunaEventProcessor
     void AddEvent(int funcRef, uint32 min, uint32 max, uint32 repeats);
 
 private:
-    enum class DeferredOpType
-    {
-        AddEvent,
-        SetState,
-        SetStates,
-        ClearAll
-    };
-
     struct DeferredOp
     {
-        DeferredOpType type;
-        LuaEvent* event = nullptr;
         int eventId = 0;
+        DeferredOpType type;
         LuaEventState state = LUAEVENT_STATE_RUN;
+        LuaEvent* event = nullptr;
     };
 
     void ClearAllEvents();