From 450f4249f34a80d6f5509af32c50d2f61eaadc69 Mon Sep 17 00:00:00 2001
From: Dennis Andersen <carl.dennis.andersen@gmail.com>
Date: Mon, 10 Feb 2014 22:25:31 +0100
Subject: [PATCH] Documentation - Updated uml diagrams

---
 Code/Dokumentation/Danbias Structure.uxf      | 455 ++++++++++--------
 Code/Dokumentation/GameServer.uxf             | 311 ++++++------
 Code/Dokumentation/Resource.uxf               | 260 ++++++++--
 .../GameClientState/LobbyState.cpp            |   2 +-
 .../GameClientState/LoginState.cpp            |   1 +
 Code/Misc/Misc.vcxproj                        |  42 +-
 Code/Misc/Resource/ResourceManager.h          |   3 +-
 7 files changed, 657 insertions(+), 417 deletions(-)

diff --git a/Code/Dokumentation/Danbias Structure.uxf b/Code/Dokumentation/Danbias Structure.uxf
index c24380c9..d52aa795 100644
--- a/Code/Dokumentation/Danbias Structure.uxf	
+++ b/Code/Dokumentation/Danbias Structure.uxf	
@@ -1,212 +1,197 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <diagram program="umlet" version="12.2">
-  <zoom_level>11</zoom_level>
+  <zoom_level>7</zoom_level>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>847</x>
-      <y>363</y>
-      <w>132</w>
-      <h>33</h>
+      <x>728</x>
+      <y>413</y>
+      <w>91</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Graphics</panel_attributes>
+    <panel_attributes>Graphics &lt;&lt;module&gt;&gt;
+bg=orange</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>561</x>
-      <y>363</y>
-      <w>132</w>
-      <h>33</h>
+      <x>546</x>
+      <y>413</y>
+      <w>84</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Sound</panel_attributes>
+    <panel_attributes>Sound&lt;&lt;?&gt;&gt;</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>671</x>
-      <y>209</y>
-      <w>132</w>
-      <h>33</h>
+      <x>616</x>
+      <y>322</y>
+      <w>84</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Physics</panel_attributes>
+    <panel_attributes>Physics &lt;&lt;module&gt;&gt;
+bg=orange</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>858</x>
-      <y>132</y>
-      <w>121</w>
-      <h>33</h>
+      <x>735</x>
+      <y>238</y>
+      <w>77</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Game client</panel_attributes>
+    <panel_attributes>Game client &lt;&lt;dll&gt;&gt;
+bg=red</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>484</x>
-      <y>209</y>
-      <w>154</w>
-      <h>33</h>
+      <x>616</x>
+      <y>287</y>
+      <w>98</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Gamelogic</panel_attributes>
+    <panel_attributes>Gamelogic &lt;&lt;dll&gt;&gt;
+bg=red</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>506</x>
-      <y>132</y>
-      <w>121</w>
-      <h>33</h>
+      <x>504</x>
+      <y>238</y>
+      <w>84</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Game server</panel_attributes>
+    <panel_attributes>Game server &lt;&lt;dll&gt;&gt;
+bg=red</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>671</x>
-      <y>132</y>
-      <w>132</w>
-      <h>33</h>
+      <x>616</x>
+      <y>238</y>
+      <w>84</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Network</panel_attributes>
+    <panel_attributes>Network &lt;&lt;module&gt;&gt;
+bg=orange</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>704</x>
-      <y>363</y>
-      <w>132</w>
-      <h>33</h>
+      <x>637</x>
+      <y>413</y>
+      <w>84</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Input</panel_attributes>
+    <panel_attributes>Input&lt;&lt;lib&gt;&gt;
+bg=blue</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>495</x>
-      <y>55</y>
-      <w>176</w>
-      <h>44</h>
+      <x>714</x>
+      <y>182</y>
+      <w>98</w>
+      <h>28</h>
     </coordinates>
-    <panel_attributes>DanBiasClientLauncher
+    <panel_attributes>GameLauncher &lt;&lt;exe&gt;&gt;
 bg=green</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>880</x>
-      <y>132</y>
-      <w>54</w>
-      <h>252</h>
+      <x>749</x>
+      <y>238</y>
+      <w>34</w>
+      <h>188</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>33;231;33;209;33;33</additional_attributes>
+    <additional_attributes>21;175;21;161;21;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>583</x>
-      <y>132</y>
-      <w>351</w>
-      <h>252</h>
+      <x>560</x>
+      <y>238</y>
+      <w>223</w>
+      <h>188</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>33;231;33;209;330;209;330;33</additional_attributes>
+    <additional_attributes>21;175;21;161;210;161;210;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>528</x>
-      <y>132</y>
-      <w>54</w>
-      <h>98</h>
+      <x>525</x>
+      <y>238</y>
+      <w>146</w>
+      <h>62</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>33;77;33;33</additional_attributes>
+    <additional_attributes>133;49;133;35;21;35;21;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>594</x>
-      <y>110</y>
-      <w>98</w>
-      <h>54</h>
+      <x>567</x>
+      <y>224</y>
+      <w>62</w>
+      <h>34</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>77;33;33;33</additional_attributes>
+    <additional_attributes>49;21;21;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>605</x>
-      <y>187</y>
-      <w>87</w>
-      <h>54</h>
+      <x>637</x>
+      <y>287</y>
+      <w>34</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>66;33;33;33</additional_attributes>
+    <additional_attributes>21;35;21;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>737</x>
-      <y>132</y>
-      <w>197</w>
-      <h>252</h>
+      <x>658</x>
+      <y>238</y>
+      <w>125</w>
+      <h>188</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>33;231;33;209;176;209;176;33</additional_attributes>
+    <additional_attributes>21;175;21;161;112;161;112;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>770</x>
-      <y>110</y>
-      <w>109</w>
-      <h>54</h>
+      <x>679</x>
+      <y>224</y>
+      <w>69</w>
+      <h>34</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>33;33;88;33</additional_attributes>
-  </element>
-  <element>
-    <type>com.umlet.element.Relation</type>
-    <coordinates>
-      <x>880</x>
-      <y>66</y>
-      <w>54</w>
-      <h>87</h>
-    </coordinates>
-    <panel_attributes>lt=&gt;-</panel_attributes>
-    <additional_attributes>33;33;33;66</additional_attributes>
-  </element>
-  <element>
-    <type>com.umlet.element.Relation</type>
-    <coordinates>
-      <x>528</x>
-      <y>66</y>
-      <w>54</w>
-      <h>87</h>
-    </coordinates>
-    <panel_attributes>lt=&gt;-</panel_attributes>
-    <additional_attributes>33;33;33;66</additional_attributes>
+    <additional_attributes>21;21;56;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
-      <x>440</x>
-      <y>22</y>
-      <w>550</w>
-      <h>396</h>
+      <x>455</x>
+      <y>161</y>
+      <w>371</w>
+      <h>287</h>
     </coordinates>
     <panel_attributes>GameEngine</panel_attributes>
     <additional_attributes/>
@@ -214,21 +199,21 @@ bg=green</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>880</x>
-      <y>363</y>
-      <w>54</w>
-      <h>164</h>
+      <x>749</x>
+      <y>413</y>
+      <w>34</w>
+      <h>104</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.</panel_attributes>
-    <additional_attributes>33;33;33;143</additional_attributes>
+    <additional_attributes>21;21;21;91</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
-      <x>891</x>
-      <y>506</y>
-      <w>319</w>
-      <h>220</h>
+      <x>756</x>
+      <y>504</y>
+      <w>203</w>
+      <h>140</h>
     </coordinates>
     <panel_attributes>Graphics</panel_attributes>
     <additional_attributes/>
@@ -236,10 +221,10 @@ bg=green</panel_attributes>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>902</x>
-      <y>539</y>
-      <w>297</w>
-      <h>176</h>
+      <x>763</x>
+      <y>525</y>
+      <w>189</w>
+      <h>112</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt; 
 OysterGfx
@@ -256,10 +241,10 @@ Release(resource :Model*) :void</panel_attributes>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
-      <x>561</x>
-      <y>506</y>
-      <w>308</w>
-      <h>242</h>
+      <x>546</x>
+      <y>504</y>
+      <w>196</w>
+      <h>154</h>
     </coordinates>
     <panel_attributes>Input</panel_attributes>
     <additional_attributes/>
@@ -267,21 +252,21 @@ Release(resource :Model*) :void</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>649</x>
-      <y>363</y>
-      <w>142</w>
-      <h>175</h>
+      <x>602</x>
+      <y>413</y>
+      <w>90</w>
+      <h>111</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.</panel_attributes>
-    <additional_attributes>121;33;121;154;33;154</additional_attributes>
+    <additional_attributes>77;21;77;98;21;98</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>572</x>
-      <y>539</y>
-      <w>286</w>
-      <h>198</h>
+      <x>553</x>
+      <y>525</y>
+      <w>182</w>
+      <h>126</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt; 
 RawInput
@@ -299,32 +284,33 @@ Enable(Enable :bool) :void</panel_attributes>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>451</x>
-      <y>363</y>
-      <w>99</w>
-      <h>33</h>
+      <x>462</x>
+      <y>413</y>
+      <w>77</w>
+      <h>21</h>
     </coordinates>
-    <panel_attributes>Window API</panel_attributes>
+    <panel_attributes>Window API&lt;&lt;lib&gt;&gt;
+bg=blue</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>462</x>
-      <y>132</y>
-      <w>472</w>
-      <h>252</h>
+      <x>483</x>
+      <y>238</y>
+      <w>300</w>
+      <h>188</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>33;231;33;209;451;209;451;33</additional_attributes>
+    <additional_attributes>21;175;21;161;287;161;287;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
-      <x>176</x>
-      <y>506</y>
-      <w>374</w>
-      <h>242</h>
+      <x>301</x>
+      <y>504</y>
+      <w>238</w>
+      <h>154</h>
     </coordinates>
     <panel_attributes>Sound</panel_attributes>
     <additional_attributes/>
@@ -332,10 +318,10 @@ Enable(Enable :bool) :void</panel_attributes>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>187</x>
-      <y>539</y>
-      <w>352</w>
-      <h>121</h>
+      <x>308</x>
+      <y>525</y>
+      <w>224</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt; 
 SoundWrapper
@@ -349,10 +335,10 @@ Release(Resource :ResourceHandle*) :void</panel_attributes>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>187</x>
-      <y>693</y>
-      <w>352</w>
-      <h>44</h>
+      <x>308</x>
+      <y>623</y>
+      <w>224</w>
+      <h>28</h>
     </coordinates>
     <panel_attributes>&lt;&lt;API&gt;&gt; 
 --
@@ -362,79 +348,152 @@ FMOD</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>330</x>
-      <y>627</y>
-      <w>54</w>
-      <h>87</h>
+      <x>399</x>
+      <y>581</y>
+      <w>34</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.</panel_attributes>
-    <additional_attributes>33;66;33;33</additional_attributes>
+    <additional_attributes>21;42;21;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>286</x>
-      <y>363</y>
-      <w>362</w>
-      <h>175</h>
+      <x>371</x>
+      <y>413</y>
+      <w>230</w>
+      <h>111</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.</panel_attributes>
-    <additional_attributes>341;33;341;88;253;88;253;154;33;154</additional_attributes>
+    <additional_attributes>217;21;217;56;161;56;161;98;21;98</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>781</x>
-      <y>55</y>
-      <w>198</w>
-      <h>44</h>
+      <x>476</x>
+      <y>329</y>
+      <w>84</w>
+      <h>28</h>
     </coordinates>
-    <panel_attributes>DanBiasServerLauncher
+    <panel_attributes>Math &lt;&lt;lib&gt;&gt;
+--
+/Is used globaly/
+bg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <type>com.umlet.element.Relation</type>
+    <coordinates>
+      <x>539</x>
+      <y>238</y>
+      <w>237</w>
+      <h>125</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;-</panel_attributes>
+    <additional_attributes>21;112;224;112;224;21</additional_attributes>
+  </element>
+  <element>
+    <type>com.umlet.element.Class</type>
+    <coordinates>
+      <x>476</x>
+      <y>294</y>
+      <w>77</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>Misc &lt;&lt;lib&gt;&gt;
+--
+/Is used globaly/
+bg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <type>com.umlet.element.Relation</type>
+    <coordinates>
+      <x>539</x>
+      <y>273</y>
+      <w>90</w>
+      <h>76</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;-</panel_attributes>
+    <additional_attributes>21;63;56;63;56;21;77;21</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>105</x>
+      <y>168</y>
+      <w>245</w>
+      <h>140</h>
+    </coordinates>
+    <panel_attributes>/*HISTORY*/
+--
+10/2-2014
+Renamed DanBiasClientLauncher -&gt; GameLauncher
+Removed DanBiasServerLauncher - connected to GameClient
+Added missing cconnections
+Specified what type of box and added a colour
+--
+elementstyle=wordwrap
+bg=gray
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <type>com.umlet.element.Relation</type>
+    <coordinates>
+      <x>749</x>
+      <y>189</y>
+      <w>34</w>
+      <h>62</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;-</panel_attributes>
+    <additional_attributes>21;49;21;21</additional_attributes>
+  </element>
+  <element>
+    <type>com.umlet.element.Class</type>
+    <coordinates>
+      <x>504</x>
+      <y>189</y>
+      <w>91</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>ServerUI &lt;&lt;exe&gt;&gt;
+--
+/template for future/
 bg=green</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
-    <type>com.umlet.element.Class</type>
+    <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>671</x>
-      <y>253</y>
-      <w>132</w>
-      <h>33</h>
+      <x>525</x>
+      <y>196</y>
+      <w>34</w>
+      <h>55</h>
     </coordinates>
-    <panel_attributes>Math</panel_attributes>
-    <additional_attributes/>
+    <panel_attributes>lt=&lt;-</panel_attributes>
+    <additional_attributes>21;42;21;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>770</x>
-      <y>132</y>
-      <w>153</w>
-      <h>164</h>
+      <x>539</x>
+      <y>308</y>
+      <w>90</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>33;143;132;143;132;33</additional_attributes>
-  </element>
-  <element>
-    <type>com.umlet.element.Class</type>
-    <coordinates>
-      <x>682</x>
-      <y>297</y>
-      <w>99</w>
-      <h>33</h>
-    </coordinates>
-    <panel_attributes>Misc</panel_attributes>
-    <additional_attributes/>
+    <additional_attributes>21;35;63;35;63;21;77;21</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>605</x>
-      <y>198</y>
-      <w>87</w>
-      <h>98</h>
+      <x>532</x>
+      <y>273</y>
+      <w>97</w>
+      <h>41</h>
     </coordinates>
     <panel_attributes>lt=&lt;-</panel_attributes>
-    <additional_attributes>66;77;44;77;44;33;33;33</additional_attributes>
+    <additional_attributes>21;28;56;28;56;21;84;21</additional_attributes>
   </element>
 </diagram>
diff --git a/Code/Dokumentation/GameServer.uxf b/Code/Dokumentation/GameServer.uxf
index 735a2592..890e2cbb 100644
--- a/Code/Dokumentation/GameServer.uxf
+++ b/Code/Dokumentation/GameServer.uxf
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<diagram program="umlet" version="12.1">
-  <zoom_level>10</zoom_level>
+<diagram program="umlet" version="12.2">
+  <zoom_level>8</zoom_level>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>610</x>
-      <y>340</y>
-      <w>100</w>
-      <h>30</h>
+      <x>632</x>
+      <y>344</y>
+      <w>104</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>GameLobby
 </panel_attributes>
@@ -16,137 +16,100 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>580</x>
-      <y>480</y>
-      <w>160</w>
-      <h>80</h>
+      <x>624</x>
+      <y>416</y>
+      <w>128</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>GameSession
 --
 /One instance of a game/
-/including x number of/
-/players./</panel_attributes>
+/including n players./</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>620</x>
-      <y>340</y>
-      <w>60</w>
-      <h>160</h>
+      <x>664</x>
+      <y>344</y>
+      <w>40</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=-&gt;&gt;&gt;&gt;</panel_attributes>
-    <additional_attributes>30;140;40;30</additional_attributes>
+    <additional_attributes>24;72;24;24</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>710</x>
-      <y>480</y>
-      <w>100</w>
-      <h>50</h>
+      <x>664</x>
+      <y>440</y>
+      <w>40</w>
+      <h>104</h>
     </coordinates>
     <panel_attributes>lt=&gt;&gt;&gt;&gt;-</panel_attributes>
-    <additional_attributes>80;30;30;30</additional_attributes>
+    <additional_attributes>24;88;24;24</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>600</x>
-      <y>180</y>
-      <w>120</w>
-      <h>120</h>
+      <x>40</x>
+      <y>120</y>
+      <w>368</w>
+      <h>344</h>
     </coordinates>
-    <panel_attributes>GameServer</panel_attributes>
+    <panel_attributes>GameServerAPI &lt;&lt;singleton&gt;&gt;
+--
+{innerclass
++ServerInitDesc&lt;&lt;struct&gt;&gt;
+--
+serverName :char pointer
+listenPort :int
+bool broadcast :bool
+ServerInitDesc() :void
+innerclass}
+{innerclass
++GameServerInfo&lt;&lt;struct&gt;&gt;
+--
+listenPort :unsigned int
+serverIp :const char pointer
+innerclass}
+
++static DanBiasServerReturn	ServerInitiate(const ServerInitDesc&amp; desc);
++static ServerStart() :void
++static ServerStop() :void
++static ServerUpdate() :void
++static ServerGetInfo() :GameServerInfo
++static ServerIsRunning() :bool
++static GameSetMapId( val :const int&amp; ) :void
++static GameSetMaxClients( val :const int&amp; ) :void
++static GameSetGameMode(val :const int&amp;) :void
++static GameSetGameTime(val :const int&amp;) :void
++static GameGetMapId() :int
++static GameGetMaxClients() :int
++static GameGetGameMode() :int
++static GameGetGameTime() :int
++static GameGetGameName() :const char pointer
++static GameStart() :bool</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>630</x>
-      <y>270</y>
-      <w>50</w>
-      <h>90</h>
-    </coordinates>
-    <panel_attributes>lt=&gt;&gt;&gt;&gt;-</panel_attributes>
-    <additional_attributes>30;70;30;30</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>590</x>
-      <y>100</y>
-      <w>130</w>
+      <x>384</x>
+      <y>328</y>
+      <w>264</w>
       <h>40</h>
     </coordinates>
-    <panel_attributes>&lt;&lt;wrapper&gt;&gt;
-DanBiasServerAPI</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <type>com.umlet.element.Relation</type>
-    <coordinates>
-      <x>630</x>
-      <y>110</y>
-      <w>50</w>
-      <h>90</h>
-    </coordinates>
-    <panel_attributes>lt=&gt;&gt;&gt;&gt;-
-</panel_attributes>
-    <additional_attributes>30;70;30;30</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>1060</x>
-      <y>330</y>
-      <w>120</w>
-      <h>50</h>
-    </coordinates>
-    <panel_attributes>NetworkSession</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <type>com.umlet.element.Relation</type>
-    <coordinates>
-      <x>690</x>
-      <y>220</y>
-      <w>390</w>
-      <h>50</h>
-    </coordinates>
-    <panel_attributes>lt=-&lt;&lt;&lt;&lt;</panel_attributes>
-    <additional_attributes>30;30;370;30</additional_attributes>
-  </element>
-  <element>
-    <type>com.umlet.element.Relation</type>
-    <coordinates>
-      <x>680</x>
-      <y>320</y>
-      <w>400</w>
-      <h>50</h>
-    </coordinates>
-    <panel_attributes>lt=-&gt;&gt;&gt;&gt;&gt;</panel_attributes>
-    <additional_attributes>30;30;380;30</additional_attributes>
-  </element>
-  <element>
-    <type>com.umlet.element.Relation</type>
-    <coordinates>
-      <x>690</x>
-      <y>340</y>
-      <w>390</w>
-      <h>160</h>
-    </coordinates>
-    <panel_attributes>lt=-&gt;&gt;&gt;&gt;&gt;</panel_attributes>
-    <additional_attributes>30;140;40;40;370;30</additional_attributes>
+    <panel_attributes>lt=&gt;&gt;&gt;&gt;-</panel_attributes>
+    <additional_attributes>248;24;24;24</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
-      <x>460</x>
-      <y>640</y>
-      <w>120</w>
-      <h>50</h>
+      <x>440</x>
+      <y>424</y>
+      <w>96</w>
+      <h>40</h>
     </coordinates>
     <panel_attributes>GameLogicAPI
 bg=blue</panel_attributes>
@@ -155,21 +118,21 @@ bg=blue</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>370</x>
-      <y>530</y>
-      <w>350</w>
-      <h>290</h>
+      <x>512</x>
+      <y>424</y>
+      <w>128</w>
+      <h>40</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.</panel_attributes>
-    <additional_attributes>90;150;30;270;330;240;240;30</additional_attributes>
+    <additional_attributes>24;24;112;24</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>790</x>
-      <y>500</y>
-      <w>100</w>
-      <h>30</h>
+      <x>624</x>
+      <y>528</y>
+      <w>144</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>GameClient</panel_attributes>
     <additional_attributes/>
@@ -177,21 +140,21 @@ bg=blue</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>670</x>
-      <y>530</y>
-      <w>150</w>
-      <h>180</h>
+      <x>520</x>
+      <y>416</y>
+      <w>120</w>
+      <h>104</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.</panel_attributes>
-    <additional_attributes>130;160;30;30</additional_attributes>
+    <additional_attributes>24;88;64;88;64;24;104;24</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
-      <x>800</x>
-      <y>670</y>
-      <w>120</w>
-      <h>40</h>
+      <x>448</x>
+      <y>480</y>
+      <w>96</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>GameProtocols
 bg=#aaaaa</panel_attributes>
@@ -200,10 +163,10 @@ bg=#aaaaa</panel_attributes>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
-      <x>1040</x>
-      <y>200</y>
-      <w>160</w>
-      <h>190</h>
+      <x>720</x>
+      <y>160</y>
+      <w>152</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>NetworkAPI
 bg=#a21aff</panel_attributes>
@@ -212,56 +175,84 @@ bg=#a21aff</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1060</x>
-      <y>280</y>
-      <w>120</w>
-      <h>40</h>
+      <x>40</x>
+      <y>24</y>
+      <w>320</w>
+      <h>64</h>
     </coordinates>
-    <panel_attributes>NetworkClient</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>1060</x>
-      <y>230</y>
-      <w>120</w>
-      <h>40</h>
-    </coordinates>
-    <panel_attributes>NetworkServer</panel_attributes>
+    <panel_attributes>/*HISTORY*/
+--
+10/2-2014
+Restructured old
+--
+elementstyle=wordwrap
+bg=gray</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>690</x>
-      <y>240</y>
-      <w>390</w>
-      <h>80</h>
+      <x>720</x>
+      <y>160</y>
+      <w>40</w>
+      <h>272</h>
     </coordinates>
-    <panel_attributes>lt=-&gt;</panel_attributes>
-    <additional_attributes>30;30;200;30;200;60;370;60</additional_attributes>
+    <panel_attributes>lt=&lt;&lt;.</panel_attributes>
+    <additional_attributes>24;24;24;256</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>690</x>
-      <y>260</y>
-      <w>390</w>
-      <h>100</h>
+      <x>704</x>
+      <y>160</y>
+      <w>40</w>
+      <h>200</h>
     </coordinates>
-    <panel_attributes>lt=-&lt;&lt;&lt;&lt;</panel_attributes>
-    <additional_attributes>30;30;180;30;180;80;370;80</additional_attributes>
+    <panel_attributes>lt=&lt;&lt;.</panel_attributes>
+    <additional_attributes>24;24;24;184</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>860</x>
-      <y>270</y>
-      <w>380</w>
-      <h>260</h>
+      <x>384</x>
+      <y>152</y>
+      <w>352</w>
+      <h>40</h>
     </coordinates>
-    <panel_attributes>lt=&gt;&gt;&gt;-</panel_attributes>
-    <additional_attributes>320;30;360;30;360;230;30;240</additional_attributes>
+    <panel_attributes>lt=&lt;&lt;.</panel_attributes>
+    <additional_attributes>336;24;24;24</additional_attributes>
+  </element>
+  <element>
+    <type>com.umlet.element.Relation</type>
+    <coordinates>
+      <x>736</x>
+      <y>160</y>
+      <w>40</w>
+      <h>384</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.</panel_attributes>
+    <additional_attributes>24;24;24;368</additional_attributes>
+  </element>
+  <element>
+    <type>com.umlet.element.Relation</type>
+    <coordinates>
+      <x>520</x>
+      <y>480</y>
+      <w>136</w>
+      <h>64</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.</panel_attributes>
+    <additional_attributes>24;24;120;24;120;48</additional_attributes>
+  </element>
+  <element>
+    <type>com.umlet.element.Relation</type>
+    <coordinates>
+      <x>512</x>
+      <y>432</y>
+      <w>160</w>
+      <h>112</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.</panel_attributes>
+    <additional_attributes>24;24;72;24;72;72;144;72;144;96</additional_attributes>
   </element>
 </diagram>
diff --git a/Code/Dokumentation/Resource.uxf b/Code/Dokumentation/Resource.uxf
index c62ae895..1258c9af 100644
--- a/Code/Dokumentation/Resource.uxf
+++ b/Code/Dokumentation/Resource.uxf
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<diagram program="umlet" version="12.1">
-  <zoom_level>16</zoom_level>
+<diagram program="umlet" version="12.2">
+  <zoom_level>6</zoom_level>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>560</x>
-      <y>80</y>
-      <w>176</w>
-      <h>80</h>
+      <x>198</x>
+      <y>300</y>
+      <w>66</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt;
 OysterResource</panel_attributes>
@@ -16,23 +16,23 @@ OysterResource</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>528</x>
-      <y>112</y>
-      <w>206</w>
-      <h>160</h>
+      <x>186</x>
+      <y>312</y>
+      <w>76</w>
+      <h>60</h>
     </coordinates>
     <panel_attributes>lt=&gt;&gt;
 implements
 </panel_attributes>
-    <additional_attributes>112;128;112;48</additional_attributes>
+    <additional_attributes>42;48;42;18</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Actor</type>
     <coordinates>
-      <x>352</x>
-      <y>240</y>
-      <w>128</w>
-      <h>192</h>
+      <x>120</x>
+      <y>360</y>
+      <w>48</w>
+      <h>72</h>
     </coordinates>
     <panel_attributes>Dev</panel_attributes>
     <additional_attributes/>
@@ -40,22 +40,22 @@ implements
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>320</x>
-      <y>32</y>
-      <w>272</w>
-      <h>240</h>
+      <x>108</x>
+      <y>282</y>
+      <w>102</w>
+      <h>90</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 interacts&gt;</panel_attributes>
-    <additional_attributes>240;80;96;80;96;208</additional_attributes>
+    <additional_attributes>90;30;36;30;36;78</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>576</x>
-      <y>576</y>
-      <w>160</w>
-      <h>32</h>
+      <x>204</x>
+      <y>486</y>
+      <w>60</w>
+      <h>12</h>
     </coordinates>
     <panel_attributes>CustomLoader</panel_attributes>
     <additional_attributes/>
@@ -63,10 +63,10 @@ interacts&gt;</panel_attributes>
   <element>
     <type>com.umlet.element.Class</type>
     <coordinates>
-      <x>576</x>
-      <y>528</y>
-      <w>160</w>
-      <h>32</h>
+      <x>204</x>
+      <y>468</y>
+      <w>60</w>
+      <h>12</h>
     </coordinates>
     <panel_attributes>
 ByteLoader</panel_attributes>
@@ -75,33 +75,33 @@ ByteLoader</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>464</x>
-      <y>384</y>
-      <w>144</w>
-      <h>192</h>
+      <x>162</x>
+      <y>414</y>
+      <w>54</w>
+      <h>72</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>80;48;48;48;48;160;112;160</additional_attributes>
+    <additional_attributes>30;18;18;18;18;60;42;60</additional_attributes>
   </element>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>368</x>
-      <y>384</y>
-      <w>266</w>
-      <h>240</h>
+      <x>126</x>
+      <y>414</y>
+      <w>98</w>
+      <h>90</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 implements partly</panel_attributes>
-    <additional_attributes>176;48;144;48;144;208;208;208</additional_attributes>
+    <additional_attributes>66;18;54;18;54;78;78;78</additional_attributes>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>544</x>
-      <y>240</y>
-      <w>208</w>
-      <h>128</h>
+      <x>192</x>
+      <y>360</y>
+      <w>78</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>--
 &lt;&lt;interface&gt;&gt;
@@ -115,10 +115,10 @@ halign=center</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>544</x>
-      <y>400</y>
-      <w>208</w>
-      <h>80</h>
+      <x>192</x>
+      <y>420</y>
+      <w>78</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>
 OResource
@@ -130,13 +130,171 @@ halign=center</panel_attributes>
   <element>
     <type>com.umlet.element.Relation</type>
     <coordinates>
-      <x>688</x>
-      <y>256</y>
-      <w>196</w>
-      <h>224</h>
+      <x>252</x>
+      <y>366</y>
+      <w>66</w>
+      <h>84</h>
     </coordinates>
     <panel_attributes>lt=&gt;&gt;&gt;&gt;
 manages&gt;</panel_attributes>
-    <additional_attributes>64;192;112;192;112;48;64;48</additional_attributes>
+    <additional_attributes>18;72;36;72;36;18;18;18</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>108</x>
+      <y>282</y>
+      <w>240</w>
+      <h>234</h>
+    </coordinates>
+    <panel_attributes>old
+bg=gray</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>402</x>
+      <y>342</y>
+      <w>576</w>
+      <h>204</h>
+    </coordinates>
+    <panel_attributes>ResourceManager
+--
++ ResourceManager() :void
++ ~ResourceManager() :void
++ HBYTEARRAY		LoadBytes(const wchar_t filename[], ResourceType type, int customId = -1, bool force = false)
++ HRESOURCE		LoadResource(const wchar_t filename[], LoadFunction loadFnc = 0, UnloadFunction unloadFnc = 0, int customId = -1, bool force = false)
++ HRESOURCE		ReloadResource(const wchar_t filename[])
++ HRESOURCE		ReloadResource(HRESOURCE&amp; resource)
++ void			Clean()
++ void			ReleaseResource(const HRESOURCE&amp; resource)
++ void			ReleaseResource(const wchar_t filename[])
++ void			SetResourceId(const HRESOURCE&amp; resource, unsigned int id)
++ void			SetResourceId(const wchar_t filename[], unsigned int id)
++ ResourceType	GetResourceType(const HRESOURCE&amp; resource)
++ ResourceType	GetResourceType (const wchar_t filename[])
++ const wchar_t*	GetResourceFilename(const HRESOURCE&amp; resource);
++ HRESOURCE		GetResourceHandle(const wchar_t filename[])
++ int				GetResourceId(const HRESOURCE&amp; resource);
++ int				GetResourceId(const wchar_t filename[]);
+--
+- ResourceManager(const ResourceManager&amp; obj);
+- const ResourceManager&amp; operator=(const ResourceManager&amp;);
+- std::map&lt;std::wstring, ResourceData*&gt; resources;</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>390</x>
+      <y>198</y>
+      <w>600</w>
+      <h>360</h>
+    </coordinates>
+    <panel_attributes>Oyster &lt;&lt;namespace&gt;&gt;
+--
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>396</x>
+      <y>222</y>
+      <w>588</w>
+      <h>330</h>
+    </coordinates>
+    <panel_attributes>Resource &lt;&lt;namespace&gt;&gt;
+--
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>534</x>
+      <y>282</y>
+      <w>126</w>
+      <h>18</h>
+    </coordinates>
+    <panel_attributes>HRESOURCE: void* &lt;&lt;typedef&gt;&gt;</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>534</x>
+      <y>300</y>
+      <w>126</w>
+      <h>18</h>
+    </coordinates>
+    <panel_attributes>HBYTE: char &lt;&lt;typedef&gt;&gt;</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>534</x>
+      <y>318</y>
+      <w>126</w>
+      <h>18</h>
+    </coordinates>
+    <panel_attributes>HBYTEARRAY: char* &lt;&lt;typedef&gt;&gt;</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>534</x>
+      <y>246</y>
+      <w>264</w>
+      <h>18</h>
+    </coordinates>
+    <panel_attributes>UnloadFunction :void(*UnloadFunction)(void* loadedData) &lt;&lt;typedef&gt;&gt;</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>534</x>
+      <y>264</y>
+      <w>288</w>
+      <h>18</h>
+    </coordinates>
+    <panel_attributes>LoadFunction :void*(*LoadFunction)(const wchar_t filename[]) &lt;&lt;typedef&gt;&gt;</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>402</x>
+      <y>246</y>
+      <w>126</w>
+      <h>90</h>
+    </coordinates>
+    <panel_attributes>ResourceType &lt;&lt;enum&gt;&gt;
+--
+ResourceType_Byte_Raw
+ResourceType_Byte_ANSI
+ResourceType_Byte_UTF8
+ResourceType_Byte_UNICODE
+ResourceType_Byte_UTF16LE
+ResourceType_CUSTOM
+ResourceType_INVALID
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>378</x>
+      <y>174</y>
+      <w>630</w>
+      <h>396</h>
+    </coordinates>
+    <panel_attributes>New
+bg=green</panel_attributes>
+    <additional_attributes/>
   </element>
 </diagram>
diff --git a/Code/Game/DanBiasGame/GameClientState/LobbyState.cpp b/Code/Game/DanBiasGame/GameClientState/LobbyState.cpp
index ccfe636d..98d192dd 100644
--- a/Code/Game/DanBiasGame/GameClientState/LobbyState.cpp
+++ b/Code/Game/DanBiasGame/GameClientState/LobbyState.cpp
@@ -95,7 +95,7 @@ GameClientState::ClientState LobbyState::Update(float deltaTime, InputClass* Key
 		{
 			if(!DanBias::GameServerAPI::GameStart())
 			{
-				//this->nwClient->Send(GameLogic::Protocol_LobbyStartGame());
+				
 			}
 		}
 	}
diff --git a/Code/Game/DanBiasGame/GameClientState/LoginState.cpp b/Code/Game/DanBiasGame/GameClientState/LoginState.cpp
index e2392558..4b6c8df9 100644
--- a/Code/Game/DanBiasGame/GameClientState/LoginState.cpp
+++ b/Code/Game/DanBiasGame/GameClientState/LoginState.cpp
@@ -119,6 +119,7 @@ GameClientState::ClientState LoginState::Update(float deltaTime, InputClass* Key
 	{
 		// game ip
 		nwClient->Connect(15152, "127.0.0.1");
+		//nwClient->Connect(15152, "83.254.217.248");
 
 		if (!nwClient->IsConnected())
 		{
diff --git a/Code/Misc/Misc.vcxproj b/Code/Misc/Misc.vcxproj
index 2d9392a3..512784e7 100644
--- a/Code/Misc/Misc.vcxproj
+++ b/Code/Misc/Misc.vcxproj
@@ -147,10 +147,30 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Packing\Packing.cpp" />
-    <ClCompile Include="Resource\Loaders\ByteLoader.cpp" />
-    <ClCompile Include="Resource\Loaders\CustomLoader.cpp" />
-    <ClCompile Include="Resource\OResourceHandler.cpp" />
-    <ClCompile Include="Resource\OResource.cpp" />
+    <ClCompile Include="Resource\Loaders\ByteLoader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Resource\Loaders\CustomLoader.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Resource\OResourceHandler.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Resource\OResource.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="Resource\ResourceManager.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
@@ -171,8 +191,18 @@
     <ClInclude Include="PostBox\IPostBox.h" />
     <ClInclude Include="PostBox\PostBox.h" />
     <ClInclude Include="Queue.h" />
-    <ClInclude Include="Resource\OysterResource.h" />
-    <ClInclude Include="Resource\OResource.h" />
+    <ClInclude Include="Resource\OysterResource.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Resource\OResource.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="Resource\ResourceManager.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
diff --git a/Code/Misc/Resource/ResourceManager.h b/Code/Misc/Resource/ResourceManager.h
index 4c90966e..43aa0215 100644
--- a/Code/Misc/Resource/ResourceManager.h
+++ b/Code/Misc/Resource/ResourceManager.h
@@ -13,6 +13,7 @@ namespace Oyster
 		typedef void* HRESOURCE;
 		typedef char HBYTE;
 		typedef HBYTE* HBYTEARRAY;
+
 		/** Typedef on a fuction required for custom unloading */
 		typedef void(*UnloadFunction)(void* loadedData);
 
@@ -30,7 +31,7 @@ namespace Oyster
 			ResourceType_Byte_UTF16LE,				/**< Handle can be interpeted as char[] or char* */
 
 			ResourceType_CUSTOM,					/**< Handle can be interpeted as whatever */
-			ResourceType_INVALID,					/**< Handle can be interpeted as whatever */
+			ResourceType_INVALID,
 		};
 		
 		/** A resource handler interface to interact with when loading resources.