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

# Conflicts:
#	include/Engine/Network/Client.h
#	src/Game/Game.cpp
This commit is contained in:
stiffly
2015-12-08 16:15:50 +01:00
7 changed files with 485 additions and 20 deletions
+2
View File
@@ -10,6 +10,7 @@
#include "Network/MessageType.h"
#include "Network/NetworkDefines.h"
#include "Network/WinLeakCheck.h"
#include "Core/EventBroker.h"
#include "Core/EKeyDown.h"
@@ -30,6 +31,7 @@ private:
int Receive(char* data, size_t length);
int CreateMessage(MessageType type, std::string message, char* data);
void Connect();
void Disconnect();
void MoveMessageHead(char*& data, size_t& length, size_t stepSize);
void ParseMessageType(char* data, size_t length);