From 5c1d7f614aa69add6cef8040b70c45413c418441 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sat, 15 Apr 2017 10:47:53 +0300
Subject: [PATCH] [Client] Rename readDrawStates() into readAnimFlags()

---
 apps/openmw/mwmp/Cell.cpp           |  2 +-
 apps/openmw/mwmp/Cell.hpp           |  2 +-
 apps/openmw/mwmp/CellController.cpp |  4 ++--
 apps/openmw/mwmp/CellController.hpp |  2 +-
 apps/openmw/mwmp/Networking.cpp     | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmp/Cell.cpp b/apps/openmw/mwmp/Cell.cpp
index 7665109a5..a807fef5e 100644
--- a/apps/openmw/mwmp/Cell.cpp
+++ b/apps/openmw/mwmp/Cell.cpp
@@ -88,7 +88,7 @@ void Cell::readPositions(ActorList& actorList)
     }
 }
 
-void Cell::readDrawStates(ActorList& actorList)
+void Cell::readAnimFlags(ActorList& actorList)
 {
     initializeDedicatedActors(actorList);
 
diff --git a/apps/openmw/mwmp/Cell.hpp b/apps/openmw/mwmp/Cell.hpp
index 4b232756c..036dfcb59 100644
--- a/apps/openmw/mwmp/Cell.hpp
+++ b/apps/openmw/mwmp/Cell.hpp
@@ -19,7 +19,7 @@ namespace mwmp
         void updateDedicated(float dt);
 
         void readPositions(ActorList& actorList);
-        void readDrawStates(ActorList& actorList);
+        void readAnimFlags(ActorList& actorList);
 
         void initializeLocalActors();
         void initializeDedicatedActors(ActorList& actorList);
diff --git a/apps/openmw/mwmp/CellController.cpp b/apps/openmw/mwmp/CellController.cpp
index c25048fee..c8887a5b4 100644
--- a/apps/openmw/mwmp/CellController.cpp
+++ b/apps/openmw/mwmp/CellController.cpp
@@ -102,7 +102,7 @@ void CellController::readPositions(ActorList& actorList)
     }
 }
 
-void CellController::readDrawStates(ActorList& actorList)
+void CellController::readAnimFlags(ActorList& actorList)
 {
     std::string mapIndex = actorList.cell.getDescription();
 
@@ -111,7 +111,7 @@ void CellController::readDrawStates(ActorList& actorList)
     // If this now exists, send it the data
     if (cellsActive.count(mapIndex) > 0)
     {
-        cellsActive[mapIndex]->readDrawStates(actorList);
+        cellsActive[mapIndex]->readAnimFlags(actorList);
     }
 }
 
diff --git a/apps/openmw/mwmp/CellController.hpp b/apps/openmw/mwmp/CellController.hpp
index 04c4c0c37..b3ff6363e 100644
--- a/apps/openmw/mwmp/CellController.hpp
+++ b/apps/openmw/mwmp/CellController.hpp
@@ -23,7 +23,7 @@ namespace mwmp
         void initializeLocalActors(const ESM::Cell& cell);
 
         void readPositions(mwmp::ActorList& actorList);
-        void readDrawStates(mwmp::ActorList& actorList);
+        void readAnimFlags(mwmp::ActorList& actorList);
 
         void setLocalActorRecord(std::string actorIndex, std::string cellIndex);
         void removeLocalActorRecord(std::string actorIndex);
diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp
index c523391fa..90c5a59d1 100644
--- a/apps/openmw/mwmp/Networking.cpp
+++ b/apps/openmw/mwmp/Networking.cpp
@@ -873,14 +873,10 @@ void Networking::processActorPacket(RakNet::Packet *packet)
     }
     case ID_ACTOR_ANIM_FLAGS:
     {
-        //Main::get().getCellController()->readDrawStates(actorList);
+        //Main::get().getCellController()->readAnimFlags(actorList);
 
         break;
     }
-    case ID_ACTOR_TEST:
-    {
-        break;
-    }
     case ID_ACTOR_ANIM_PLAY:
     {
         break;
@@ -905,6 +901,10 @@ void Networking::processActorPacket(RakNet::Packet *packet)
     {
         break;
     }
+    case ID_ACTOR_TEST:
+    {
+        break;
+    }
     default:
         LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Unhandled ActorPacket with identifier %i has arrived", packet->data[0]);
     }