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

# Conflicts:
#	src/Engine/Network/Client.cpp
This commit is contained in:
stiffly
2015-12-10 17:16:22 +01:00
5 changed files with 212 additions and 161 deletions
+2 -1
View File
@@ -27,7 +27,7 @@ public:
void Close();
private:
void ReadFromServer();
void SendToServer();
void SendSnapshotToServer();
int Receive(char* data, size_t length);
void Send(Package& message);
@@ -66,6 +66,7 @@ private:
// Use to check if we should send disconnect message
// if game is turned of by closing window.
bool m_WasStarted = false;
IsWASDKeyDown m_IsWASDKeyDown;
// Events
EventBroker* m_EventBroker;