From 29f66d2874eb31e5acc3b1664ac913869ca8d7b0 Mon Sep 17 00:00:00 2001
From: Dander7BD <dander.1981@gmail.com>
Date: Mon, 17 Feb 2014 11:50:51 +0100
Subject: [PATCH] Fixed build errors in GameClient

---
 Code/Game/GameClient/DanBiasGame_Impl.cpp      |  2 +-
 Code/Game/GameClient/GameClient.vcxproj        | 18 ++++++++++++++----
 Code/Game/GameClient/GameClient.vcxproj.user   |  2 +-
 .../GameClientState/Buttons/EventButtonGUI.h   |  6 ++----
 .../GameClientState/LevelLoader/LevelLoader.h  |  2 +-
 .../GameClientState/LevelLoader/LevelParser.h  |  2 +-
 .../GameClientState/LevelLoader/Loader.h       |  2 +-
 .../GameClientState/NetLoadState.cpp           |  2 ++
 8 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Code/Game/GameClient/DanBiasGame_Impl.cpp b/Code/Game/GameClient/DanBiasGame_Impl.cpp
index 244568c2..392e917f 100644
--- a/Code/Game/GameClient/DanBiasGame_Impl.cpp
+++ b/Code/Game/GameClient/DanBiasGame_Impl.cpp
@@ -18,7 +18,7 @@
 #include "WinTimer.h"
 #include "vld.h"
 
-#include "../Misc/EventHandler/EventHandler.h"
+#include "EventHandler/EventHandler.h"
 
 #include "GameClientState\SharedStateContent.h"
 
diff --git a/Code/Game/GameClient/GameClient.vcxproj b/Code/Game/GameClient/GameClient.vcxproj
index 0691fef1..a87f61e4 100644
--- a/Code/Game/GameClient/GameClient.vcxproj
+++ b/Code/Game/GameClient/GameClient.vcxproj
@@ -111,7 +111,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Misc\Misc_$(PlatformShortName)D.lib;WindowManager\WindowManager_$(PlatformShortName)D.lib;OysterGraphics_$(PlatformShortName)D.lib;Input\Input_$(PlatformShortName)D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>NetworkAPI_$(PlatformShortName)D.dll;OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
@@ -128,7 +128,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Misc\Misc_$(PlatformShortName)D.lib;WindowManager\WindowManager_$(PlatformShortName)D.lib;OysterGraphics_$(PlatformShortName)D.lib;Input\Input_$(PlatformShortName)D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>NetworkAPI_$(PlatformShortName)D.dll;OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
@@ -149,7 +149,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Misc\Misc_$(PlatformShortName).lib;WindowManager\WindowManager_$(PlatformShortName).lib;OysterGraphics_$(PlatformShortName).lib;Input\Input_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>NetworkAPI_$(PlatformShortName).dll;OysterGraphics_$(PlatformShortName).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
@@ -170,14 +170,23 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Misc\Misc_$(PlatformShortName).lib;WindowManager\WindowManager_$(PlatformShortName).lib;OysterGraphics_$(PlatformShortName).lib;Input\Input_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>NetworkAPI_$(PlatformShortName).dll;OysterGraphics_$(PlatformShortName).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Misc\Input\Input.vcxproj">
+      <Project>{7e3990d2-3d94-465c-b58d-64a74b3ecf9b}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\Misc\OysterMath\OysterMath.vcxproj">
       <Project>{f10cbc03-9809-4cba-95d8-327c287b18ee}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\Misc\Utilities\Utilities.vcxproj">
+      <Project>{2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Misc\WindowManager\WindowManager.vcxproj">
+      <Project>{35aea3c0-e0a7-4e1e-88cd-514aa5a442b1}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\Network\NetworkAPI\NetworkAPI.vcxproj">
       <Project>{460d625f-2ac9-4559-b809-0ba89ceaedf4}</Project>
     </ProjectReference>
@@ -233,6 +242,7 @@
     <ClInclude Include="GameClientState\LobbyAdminState.h" />
     <ClInclude Include="GameClientState\MainState.h" />
     <ClInclude Include="GameClientState\NetLoadState.h" />
+    <ClInclude Include="GameClientState\SharedStateContent.h" />
     <ClInclude Include="Include\GameClient.h" />
     <ClInclude Include="GameClientState\LobbyState.h" />
     <ClInclude Include="GameClientState\C_Object.h" />
diff --git a/Code/Game/GameClient/GameClient.vcxproj.user b/Code/Game/GameClient/GameClient.vcxproj.user
index 2e28d6f7..4b847ee6 100644
--- a/Code/Game/GameClient/GameClient.vcxproj.user
+++ b/Code/Game/GameClient/GameClient.vcxproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShowAllFiles>true</ShowAllFiles>
+    <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
diff --git a/Code/Game/GameClient/GameClientState/Buttons/EventButtonGUI.h b/Code/Game/GameClient/GameClientState/Buttons/EventButtonGUI.h
index d4981c23..04af2e5a 100644
--- a/Code/Game/GameClient/GameClientState/Buttons/EventButtonGUI.h
+++ b/Code/Game/GameClient/GameClientState/Buttons/EventButtonGUI.h
@@ -5,10 +5,8 @@
 #ifndef DANBIAS_CLIENT_EVENT_BUTTON_GUI_H
 #define DANBIAS_CLIENT_EVENT_BUTTON_GUI_H
 
-#include "../Misc/EventHandler/EventButton.h"
-#include "../OysterGraphics/DllInterfaces/GFXAPI.h"
-
-
+#include "EventHandler/EventButton.h"
+#include "DllInterfaces/GFXAPI.h"
 
 namespace DanBias
 {
diff --git a/Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.h b/Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.h
index 184a7005..aa67c4f5 100644
--- a/Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.h
+++ b/Code/Game/GameClient/GameClientState/LevelLoader/LevelLoader.h
@@ -7,7 +7,7 @@
 
 #include <string>
 #include <vector>
-#include "../Misc/Utilities.h"
+#include "Utilities.h"
 #include "ObjectDefines.h"
 
 namespace GameLogic
diff --git a/Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.h b/Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.h
index 346b75b5..8f2a9150 100644
--- a/Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.h
+++ b/Code/Game/GameClient/GameClientState/LevelLoader/LevelParser.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include "ObjectDefines.h"
-#include "../Misc/Utilities.h"
+#include "Utilities.h"
 
 namespace GameLogic
 {
diff --git a/Code/Game/GameClient/GameClientState/LevelLoader/Loader.h b/Code/Game/GameClient/GameClientState/LevelLoader/Loader.h
index 198c2a87..0433194e 100644
--- a/Code/Game/GameClient/GameClientState/LevelLoader/Loader.h
+++ b/Code/Game/GameClient/GameClientState/LevelLoader/Loader.h
@@ -5,7 +5,7 @@
 #ifndef LOADER_H
 #define LOADER_H
 
-#include "..\Misc\Resource\OysterResource.h"
+#include "Resource\OysterResource.h"
 #include <string>
 
 namespace GameLogic
diff --git a/Code/Game/GameClient/GameClientState/NetLoadState.cpp b/Code/Game/GameClient/GameClientState/NetLoadState.cpp
index ac7dd78b..3463182e 100644
--- a/Code/Game/GameClient/GameClientState/NetLoadState.cpp
+++ b/Code/Game/GameClient/GameClientState/NetLoadState.cpp
@@ -1,9 +1,11 @@
 #include "NetLoadState.h"
 #include "NetworkClient.h"
+#include "OysterMath.h"
 #include "../Game/GameProtocols/Protocols.h"
 
 using namespace ::DanBias::Client;
 using namespace ::Oyster;
+using namespace ::Oyster::Math;
 using namespace ::Oyster::Network;
 using namespace ::GameLogic;