From 9b348a7d973a74bf487b6fb868e6e3b20715d2b6 Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Tue, 15 Dec 2015 16:50:59 +0100
Subject: [PATCH] Updated movement code once again.

---
 src/Engine/Network/Client.cpp | 19 +++++++++++++------
 src/Engine/Network/Server.cpp | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 3d94ad15..9022b8ac 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -111,14 +111,21 @@ void Client::SendSnapshotToServer()
     }
 
     if (m_NextSnapshot.InputForward != "") {
-        Package message(MessageType::Event, m_SendPacketID);
-        message.AddString(m_NextSnapshot.InputForward);
-        Send(message);
+        Package package(MessageType::Event, m_SendPacketID);
+        package.AddString(m_NextSnapshot.InputForward);
+        Send(package);
+    } else {
+        Package package(MessageType::Event, m_SendPacketID);
+        package.AddString("0Forward");
     }
     if (m_NextSnapshot.InputRight != "") {
-        Package message(MessageType::Event, m_SendPacketID);
-        message.AddString(m_NextSnapshot.InputRight);
-        Send(message);
+        Package package(MessageType::Event, m_SendPacketID);
+        package.AddString(m_NextSnapshot.InputRight);
+        Send(package);
+    } else {
+        Package package(MessageType::Event, m_SendPacketID);
+        package.AddString("0Right");
+        Send(package);
     }
 }
 
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index 3800b88e..46b803bf 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -26,7 +26,7 @@ void Server::Start(World* world, EventBroker* eventBroker)
 }
 
 void Server::Update()
-{ 
+{
     while (m_PlayersToCreate.size() > 0) {
         unsigned int i = m_PlayersToCreate.size() - 1;
         unsigned int tempID = m_World->CreateEntity();
@@ -80,7 +80,7 @@ void Server::ReadFromClients()
                 std::cout << m_PacketID << ": Read from client crashed: " << err.what();
                 //}
             }
-            
+
         }
         std::clock_t currentTime = std::clock();
         // int tempTestRemovePlz = (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC);
@@ -300,22 +300,22 @@ void Server::ParseEvent(char * data, size_t length)
         return;
 
     unsigned int entityId = m_PlayerDefinitions[i].EntityID;
-    m_World->GetComponent(entityId, "Player")["Forward"] = false;
-    m_World->GetComponent(entityId, "Player")["Left"] = false;
-    m_World->GetComponent(entityId, "Player")["Back"] = false;
-    m_World->GetComponent(entityId, "Player")["Right"] = false;
 
     if ("+Forward" == std::string(data)) {
         m_World->GetComponent(entityId, "Player")["Forward"] = true;
-    }
-    if ("-Forward" == std::string(data)) {
+    } else if ("-Forward" == std::string(data)) {
         m_World->GetComponent(entityId, "Player")["Back"] = true;
+    } else if ("0Forward" == std::string(data)) {
+        m_World->GetComponent(entityId, "Player")["Forward"] = false;
+        m_World->GetComponent(entityId, "Player")["Back"] = false;
     }
     if ("+Right" == std::string(data)) {
         m_World->GetComponent(entityId, "Player")["Right"] = true;
-    }
-    if ("-Right" == std::string(data)) {
+    } else if ("-Right" == std::string(data)) {
         m_World->GetComponent(entityId, "Player")["Left"] = true;
+    } else if ("0Right" == std::string(data)) {
+        m_World->GetComponent(entityId, "Player")["Right"] = false;
+        m_World->GetComponent(entityId, "Player")["Left"] = false;
     }
 }
 
@@ -331,7 +331,7 @@ void Server::ParseConnect(char * data, size_t length)
 
     for (int i = 0; i < MAXCONNECTIONS; i++) {
         if (m_PlayerDefinitions[i].Endpoint.address() == boost::asio::ip::address()) {
-            
+
             //Events::CreatePlayer e;
             //e.entityID = (m_PlayerDefinitions[i].EntityID);
             //e.modelPath = "Models/Core/UnitSphere.obj";