From 58db7b755a0883b78405b593ceb25f3de9932d56 Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Tue, 8 Dec 2015 18:24:08 +0100
Subject: [PATCH] Random bugfixes and cleanup.

---
 include/Engine/Network/Server.h |  5 +----
 src/Engine/Network/Server.cpp   | 17 +++++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/include/Engine/Network/Server.h b/include/Engine/Network/Server.h
index be2e17a8..9a971f4b 100644
--- a/include/Engine/Network/Server.h
+++ b/include/Engine/Network/Server.h
@@ -23,15 +23,12 @@ private:
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::socket m_Socket;
-  //  boost::asio::ip::udp::endpoint m_Connections[MAXCONNECTIONS];
     PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
     //Timers
     std::clock_t m_StartPingTime;
     std::clock_t m_StopTimes[8];
     // Game logic
-  //  std::string m_PlayerNames[MAXCONNECTIONS];
-    char m_GameBoard[BOARDSIZE][BOARDSIZE];
-    glm::vec2 m_PlayerPositions[8];
+
     World* m_World;
 
     // Threaded
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index a6e49560..2e95c0f6 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -14,11 +14,7 @@ void Server::Start(World* world)
     m_World = world;
     for (size_t i = 0; i < MAXCONNECTIONS; i++) {
         m_StopTimes[i] = std::clock();
-        m_PlayerPositions[i].x = -1;
-        m_PlayerPositions[i].y = -1;
     }
-    m_PlayerPositions[0].x = 0;
-    m_PlayerPositions[0].y = 0;
     boost::thread_group threads;
 
     std::cout << "I am Server. BIP BOP\n";
@@ -32,7 +28,7 @@ void Server::Start(World* world)
 
 void Server::DisplayLoop()
 {
-    int lengthOfMsg = -1;
+    int lengthOfMessage = -1;
     std::clock_t previousePingMessage = std::clock();
     std::clock_t previousSnapshotMessage = std::clock();
     std::clock_t timOutTimer = std::clock();
@@ -279,12 +275,13 @@ void Server::Disconnect(int i)
 {
     Broadcast("A player disconnected");
     std::cout << "Player " << i << " disconnected/Timed out" << std::endl;
+
+	// Remove enteties and stuff
     m_PlayerDefinitions[i].Endpoint = boost::asio::ip::udp::endpoint();
-    m_PlayerDefinitions[i].EntityID = -1;
-    m_PlayerDefinitions[i].Name = "Name not Set";
-    // Reset disconnected players position
-    m_PlayerPositions[i].x = -1;
-    m_PlayerPositions[i].y = -1;
+	m_PlayerDefinitions[i].EntityID = -1;
+    m_PlayerDefinitions[i].Name = "";
+
+
 }
 
 void Server::ParseEvent(char * data, size_t length)