Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking

# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp

include/Engine/Network/Client.h

@@ -48,6 +48,7 @@ private:
     std::string m_PlayerName;
     int m_PlayerID = -1;
     EntityID m_ServerEntityID = std::numeric_limits<EntityID>::max();
+    bool m_IsConnected = false;
     // Server Client Lookup map
     // Assumes that root node for client and server is EntityID 0.
 
@@ -71,14 +72,14 @@ private:
     void ping();
     void parseMessageType(Packet& packet);
     void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType);
-     void parseConnect(Packet& packet);
+    void parseConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
     void parseServerPing();
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
-    bool isConnected();
+    bool hasServerTimedOut();
     EntityID createPlayer();
     void sendInputCommands();
     // Mapping Logic

include/Engine/Network/Network.h

@@ -7,6 +7,7 @@
 
 #define MAXCONNECTIONS 8
 #define INPUTSIZE 4097
+#define TIMEOUTMS 15000
 
 class Network
 {

include/Engine/Network/Server.h

@@ -11,7 +11,7 @@
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
 #include "Core/EventBroker.h"
-#include "Network/Network.h"
+#include "../Network/Network.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"