From de5bdef58cf40e756b53de7cc73e3fbf3d6e9306 Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Mon, 7 Dec 2015 16:52:42 +0100
Subject: [PATCH] Rectangle definition conflicted with a definition included by
 <boost/asio.hpp>.

---
 include/Engine/Rendering/IRenderer.h |  2 +-
 src/Game/Game.cpp                    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/Engine/Rendering/IRenderer.h b/include/Engine/Rendering/IRenderer.h
index 1acb2454..5dce14c7 100644
--- a/include/Engine/Rendering/IRenderer.h
+++ b/include/Engine/Rendering/IRenderer.h
@@ -35,7 +35,7 @@ public:
 	virtual void Draw(RenderQueueCollection& rq) = 0;
 
 protected:
-	Rectangle m_Resolution = Rectangle(1280, 720);
+	Rectangle m_Resolution = Rectangle::Rectangle(1280, 720);
 	bool m_Fullscreen = false;
 	bool m_VSYNC = false;
 	int m_GLVersion[2];
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index 10d19baf..611aa328 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -1,5 +1,6 @@
 #include "Game.h"
 #include "HardcodedTestWorld.h"
+#include "Network/Client.h"
 
 Game::Game(int argc, char* argv[])
 {
@@ -17,12 +18,12 @@ Game::Game(int argc, char* argv[])
 	m_Renderer = new Renderer();
 	m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
 	m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
-	m_Renderer->SetResolution(Rectangle(
+	m_Renderer->SetResolution(Rectangle::Rectangle(
 		0,
 		0,
 		m_Config->Get<int>("Video.Width", 1280),
 		m_Config->Get<int>("Video.Height", 720)
-	));
+		));
 	m_Renderer->Initialize();
 
 	// Create input manager
@@ -36,6 +37,15 @@ Game::Game(int argc, char* argv[])
     // Create a TEST WORLD
     m_World = new HardcodedTestWorld();
 
+	// TEMP: Invoke network
+	std::string inputMessage;
+	std::cout << "Start client or server? (c/s)" << std::endl;
+	std::cin >> inputMessage;
+	if (inputMessage == "c" || inputMessage == "C") {
+		Client client;
+		client.Start();
+	}
+
 	m_LastTime = glfwGetTime();
 }