Merge remote-tracking branch 'origin/Networking' into Networking

# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
This commit is contained in:
stiffly
2015-12-16 11:12:15 +01:00
6 changed files with 110 additions and 88 deletions
+4 -4
View File
@@ -60,13 +60,13 @@ private:
void SendPing();
void CheckForTimeOuts();
void Disconnect(int i);
void ParseMessageType(char* data, size_t length);
void ParseEvent(char* data, size_t length);
void ParseConnect(char* data, size_t length);
void ParseMessageType(Package& package);
void ParseEvent(Package& package);
void ParseConnect(Package& package);
void ParseDisconnect();
void ParseClientPing();
void ParseServerPing();
void ParseSnapshot(char* data, size_t length);
void ParseSnapshot(Package& package);
void IdentifyPacketLoss();
};