From 7700b829528e2a77a8da7a326280ceea3fbdbcb7 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Mon, 10 Apr 2017 16:33:07 +0300
Subject: [PATCH] [General] Clean up BaseEvent and BaseStructs

---
 components/openmw-mp/Base/BaseEvent.hpp            | 14 --------------
 components/openmw-mp/Base/BaseStructs.hpp          |  7 -------
 .../openmw-mp/Packets/Actor/PacketActorTest.cpp    |  8 --------
 3 files changed, 29 deletions(-)

diff --git a/components/openmw-mp/Base/BaseEvent.hpp b/components/openmw-mp/Base/BaseEvent.hpp
index 9f7bf6bf1..f7c60f52a 100644
--- a/components/openmw-mp/Base/BaseEvent.hpp
+++ b/components/openmw-mp/Base/BaseEvent.hpp
@@ -38,11 +38,6 @@ namespace mwmp
 
         ESM::Position position;
 
-        int drawState;
-
-        float headPitch;
-        float headYaw;
-
         int doorState;
         int lockLevel;
         float scale;
@@ -59,15 +54,6 @@ namespace mwmp
         std::string varName;
 
         ContainerChanges containerChanges;
-
-        Animation animation;
-        bool hasAnimation;
-
-        AnimStates animStates;
-        bool hasAnimStates;
-
-        Movement movement;
-        bool hasMovement;
     };
 
     struct ObjectChanges
diff --git a/components/openmw-mp/Base/BaseStructs.hpp b/components/openmw-mp/Base/BaseStructs.hpp
index 29c3778db..456bc6659 100644
--- a/components/openmw-mp/Base/BaseStructs.hpp
+++ b/components/openmw-mp/Base/BaseStructs.hpp
@@ -18,13 +18,6 @@ namespace mwmp
         int jumpstate;
         bool forcestateupdate;
     };
-
-    struct Movement
-    {
-        float x;
-        float y;
-        float z;
-    };
 }
 
 #endif //OPENMW_BASESTRUCTS_HPP
diff --git a/components/openmw-mp/Packets/Actor/PacketActorTest.cpp b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp
index c97d3bede..938352bb9 100644
--- a/components/openmw-mp/Packets/Actor/PacketActorTest.cpp
+++ b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp
@@ -45,7 +45,6 @@ void PacketActorTest::Packet(RakNet::BitStream *bs, bool send)
 
         RW(actor.hasAnimation, send);
         RW(actor.hasAnimStates, send);
-        RW(actor.hasMovement, send);
 
         if (actor.hasAnimation)
         {
@@ -63,13 +62,6 @@ void PacketActorTest::Packet(RakNet::BitStream *bs, bool send)
             RW(actor.animStates.forcestateupdate, send);
         }
 
-        if (actor.hasMovement)
-        {
-            RW(actor.movement.x, send);
-            RW(actor.movement.y, send);
-            RW(actor.movement.y, send);
-        }
-
         if (!send)
         {
             actorList->baseActors.push_back(actor);