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

# Conflicts:
#	include/Engine/Network/Client.h
#	src/Game/Game.cpp

include/Engine/Network/Client.h

@@ -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);

include/Engine/Network/Server.h

@@ -1,12 +1,58 @@
 #ifndef Server_h__
 #define Server_h__
+#include <string>
+#include <ctime>
 
-#include <boost\asio.hpp>
+#include <boost/thread.hpp>
+#include <boost/bind.hpp>
+#include <glm/common.hpp>
+#include "NetworkDefines.h"
+#include "MessageType.h"
 
 class Server
 {
-	Server();
-	~Server();
+public:
+    Server();
+    ~Server();
+    void Start();
+
+private:
+    // udp stuff
+    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];
+    //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];
+
+    // Threaded
+    void DisplayLoop();
+    void ReadFromClients();
+    void InputLoop();
+
+
+    int  Receive(char* data, size_t length);
+    int  CreateMessage(MessageType type, std::string message, char * data);
+    void MoveMessageHead(char*& data, size_t& length, size_t stepSize);
+    void Broadcast(std::string message);
+    void Broadcast(char* data, size_t length);
+    void SendSnapshot();
+    void SendPing();
+    void CheckForTimeOuts();
+    int  CreateHeader(MessageType type, char* data);
+    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 ParseDisconnect();
+    void ParseClientPing();
+    void ParseServerPing();
+    void ParseSnapshot(char* data, size_t length);
 };
 
 #endif

include/Engine/Network/WinLeakCheck.h

@@ -0,0 +1,17 @@
+#if defined (_WIN64) | defined(_WIN32)
+#ifndef WinLeakeCheck_h__
+#define WinLeakeCheck_h__
+
+//For memory leak checking
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+
+#ifdef _DEBUG
+#ifndef DBG_NEW
+#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
+#define new DBG_NEW
+#endif
+#endif  // _DEBUG
+#endif
+#endif