From d24cde16dd1b50ebf3d222e5f4c39db2fdc5f76b Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Wed, 5 Apr 2017 12:52:27 +0300
Subject: [PATCH] [General] Add simple BaseActor and LocalActor classes

---
 apps/openmw/CMakeLists.txt               |  2 +-
 apps/openmw/mwmp/LocalActor.cpp          | 19 ++++++++++++++++
 apps/openmw/mwmp/LocalActor.hpp          | 19 ++++++++++++++++
 components/openmw-mp/Base/BaseActor.hpp  | 28 ++++++++++++++++++++++++
 components/openmw-mp/Base/BasePlayer.hpp |  2 +-
 5 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwmp/LocalActor.cpp
 create mode 100644 apps/openmw/mwmp/LocalActor.hpp
 create mode 100644 components/openmw-mp/Base/BaseActor.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 9db679db3..a9ca0e4fc 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -96,7 +96,7 @@ add_openmw_dir (mwbase
     inputmanager windowmanager statemanager
     )
 
-add_openmw_dir (mwmp DedicatedPlayer WorldEvent LocalPlayer Networking Main GUIChat GUILogin GUIController PlayerMarkerCollection GUIDialogList WorldController)
+add_openmw_dir (mwmp Main Networking LocalPlayer DedicatedPlayer WorldEvent LocalActor CellController GUIChat GUILogin GUIController PlayerMarkerCollection GUIDialogList)
 
 # Main executable
 
diff --git a/apps/openmw/mwmp/LocalActor.cpp b/apps/openmw/mwmp/LocalActor.cpp
new file mode 100644
index 000000000..c278acf7e
--- /dev/null
+++ b/apps/openmw/mwmp/LocalActor.cpp
@@ -0,0 +1,19 @@
+#include "LocalActor.hpp"
+
+using namespace mwmp;
+using namespace std;
+
+LocalActor::LocalActor()
+{
+
+}
+
+LocalActor::~LocalActor()
+{
+
+}
+
+void LocalActor::update()
+{
+
+}
diff --git a/apps/openmw/mwmp/LocalActor.hpp b/apps/openmw/mwmp/LocalActor.hpp
new file mode 100644
index 000000000..9b3565153
--- /dev/null
+++ b/apps/openmw/mwmp/LocalActor.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_LOCALACTOR_HPP
+#define OPENMW_LOCALACTOR_HPP
+
+#include <components/openmw-mp/Base/BaseActor.hpp>
+
+namespace mwmp
+{
+    class LocalActor : public BaseActor
+    {
+    public:
+
+        LocalActor();
+        virtual ~LocalActor();
+
+        void update();
+    };
+}
+
+#endif //OPENMW_LOCALACTOR_HPP
diff --git a/components/openmw-mp/Base/BaseActor.hpp b/components/openmw-mp/Base/BaseActor.hpp
new file mode 100644
index 000000000..a57c60a0b
--- /dev/null
+++ b/components/openmw-mp/Base/BaseActor.hpp
@@ -0,0 +1,28 @@
+#ifndef OPENMW_BASEACTOR_HPP
+#define OPENMW_BASEACTOR_HPP
+
+#include <components/esm/loadcell.hpp>
+
+namespace mwmp
+{
+    class BaseActor
+    {
+    public:
+
+        BaseActor()
+        {
+
+        }
+
+        unsigned int movementFlags;
+        char movementAnim;
+        char drawState;
+        bool isFlying;
+
+        ESM::Position position;
+        ESM::Position direction;
+        ESM::Cell cell;
+    };
+}
+
+#endif //OPENMW_BASEACTOR_HPP
diff --git a/components/openmw-mp/Base/BasePlayer.hpp b/components/openmw-mp/Base/BasePlayer.hpp
index ce2ac9a82..06dea202c 100644
--- a/components/openmw-mp/Base/BasePlayer.hpp
+++ b/components/openmw-mp/Base/BasePlayer.hpp
@@ -5,9 +5,9 @@
 #ifndef OPENMW_BASEPLAYER_HPP
 #define OPENMW_BASEPLAYER_HPP
 
-#include <components/esm/npcstats.hpp>
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadnpc.hpp>
+#include <components/esm/npcstats.hpp>
 #include <components/esm/creaturestats.hpp>
 #include <components/esm/loadclas.hpp>
 #include <components/esm/loadspel.hpp>