From 4f3d05eed2efde5be4da7c97fbdfed1e80d5e1da Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 9 Apr 2017 10:50:35 +0300
Subject: [PATCH] [General] Add ActorList class

---
 apps/openmw-mp/Networking.cpp           |  1 +
 components/openmw-mp/Base/BaseActor.hpp | 18 ++++++++++++++++++
 components/openmw-mp/Base/BaseEvent.hpp |  1 -
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index fae15ef8e..683f311d6 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -65,6 +65,7 @@ Networking::~Networking()
 
     sThis = 0;
     delete playerPacketController;
+    delete actorPacketController;
     delete worldPacketController;
     LOG_QUIT();
 }
diff --git a/components/openmw-mp/Base/BaseActor.hpp b/components/openmw-mp/Base/BaseActor.hpp
index 76f285bba..b391f7596 100644
--- a/components/openmw-mp/Base/BaseActor.hpp
+++ b/components/openmw-mp/Base/BaseActor.hpp
@@ -3,6 +3,7 @@
 
 #include <components/esm/loadcell.hpp>
 #include <components/openmw-mp/Base/BaseStructs.hpp>
+#include <RakNetTypes.h>
 
 namespace mwmp
 {
@@ -33,6 +34,23 @@ namespace mwmp
         Movement movement;
         bool hasMovement;
     };
+
+    class ActorList
+    {
+    public:
+
+        ActorList()
+        {
+
+        }
+
+        RakNet::RakNetGUID guid;
+
+        std::vector<BaseActor> baseActors;
+        unsigned int count;
+
+        ESM::Cell cell;
+    };
 }
 
 #endif //OPENMW_BASEACTOR_HPP
diff --git a/components/openmw-mp/Base/BaseEvent.hpp b/components/openmw-mp/Base/BaseEvent.hpp
index 91a97661d..56318da22 100644
--- a/components/openmw-mp/Base/BaseEvent.hpp
+++ b/components/openmw-mp/Base/BaseEvent.hpp
@@ -2,7 +2,6 @@
 #define OPENMW_BASEEVENT_HPP
 
 #include <components/esm/loadcell.hpp>
-#include <components/esm/cellref.hpp>
 #include <components/openmw-mp/Base/BaseStructs.hpp>
 #include <RakNetTypes.h>