From 0cad1e8128bbc9128f71becef48678bc096c27bf Mon Sep 17 00:00:00 2001
From: Tamir Atias <engine.games@gmail.com>
Date: Thu, 12 Apr 2012 01:50:44 +0300
Subject: [PATCH] [Fix] Allanis' AABB errors.

---
 Bin/VC10/VC10.vcxproj         |  4 ++++
 Bin/VC10/VC10.vcxproj.filters | 18 ++++++++++++++++++
 src/Collision/AABB.cpp        | 11 +++++------
 src/Collision/AABB.h          |  2 +-
 src/Main/Game.cpp             |  1 +
 src/Main/Game.h               |  2 ++
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Bin/VC10/VC10.vcxproj b/Bin/VC10/VC10.vcxproj
index d949fcd..ce2ca4d 100644
--- a/Bin/VC10/VC10.vcxproj
+++ b/Bin/VC10/VC10.vcxproj
@@ -84,11 +84,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\Actor\Player.h" />
+    <ClInclude Include="..\..\src\Collision\AABB.h" />
     <ClInclude Include="..\..\src\Global\Constants.h" />
     <ClInclude Include="..\..\src\Global\Globals.h" />
     <ClInclude Include="..\..\src\glx\glext.h" />
     <ClInclude Include="..\..\src\glx\wglext.h" />
     <ClInclude Include="..\..\src\IO\Input.h" />
+    <ClInclude Include="..\..\src\Level\Level.h" />
     <ClInclude Include="..\..\src\Main\Game.h" />
     <ClInclude Include="..\..\src\Main\GLWindow.h" />
     <ClInclude Include="..\..\src\Math\FPS.h" />
@@ -118,8 +120,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\Actor\Player.cpp" />
+    <ClCompile Include="..\..\src\Collision\AABB.cpp" />
     <ClCompile Include="..\..\src\Global\Globals.cpp" />
     <ClCompile Include="..\..\src\IO\Input.cpp" />
+    <ClCompile Include="..\..\src\Level\Level.cpp" />
     <ClCompile Include="..\..\src\Main\Game.cpp" />
     <ClCompile Include="..\..\src\Main\GLWindow.cpp" />
     <ClCompile Include="..\..\src\Main\main.cpp" />
diff --git a/Bin/VC10/VC10.vcxproj.filters b/Bin/VC10/VC10.vcxproj.filters
index c397de8..4d2a69f 100644
--- a/Bin/VC10/VC10.vcxproj.filters
+++ b/Bin/VC10/VC10.vcxproj.filters
@@ -31,6 +31,12 @@
     <Filter Include="TMXParser">
       <UniqueIdentifier>{5bd696ec-579f-4271-9d4b-0f1fdd8b651c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Level">
+      <UniqueIdentifier>{9cc417fe-d5fd-47c3-8442-d545c358b7c2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Collision">
+      <UniqueIdentifier>{27a35a1b-7725-467a-aeb8-d169c437676e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\Main\GLWindow.h">
@@ -129,6 +135,12 @@
     <ClInclude Include="..\..\src\System\ResourceManager.h">
       <Filter>System</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\Level\Level.h">
+      <Filter>Level</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Collision\AABB.h">
+      <Filter>Collision</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\Main\main.cpp">
@@ -203,5 +215,11 @@
     <ClCompile Include="..\..\src\TMXParser\TmxObject.cpp">
       <Filter>TMXParser</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\Level\Level.cpp">
+      <Filter>Level</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Collision\AABB.cpp">
+      <Filter>Collision</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Collision/AABB.cpp b/src/Collision/AABB.cpp
index 2d31e10..0253e29 100644
--- a/src/Collision/AABB.cpp
+++ b/src/Collision/AABB.cpp
@@ -8,7 +8,7 @@ AABB::AABB(void) {
   // _max represents the top left.
   _max = Vec2(0,0);
   // _min is the bottom left.
-  _min = Vec2D(0,0);
+  _min = Vec2(0,0);
 }
 
 AABB::AABB(Vec2 &min, Vec2 &max) {
@@ -51,11 +51,10 @@ bool AABB::InCollision(AABB* otherAABB) {
 }
 
 void AABB::CreateAABBFromSprite(const char* filename) {
-  string tempName;
-  tempName = filename;
-  tempName.conatenate(".png");
+  std::string tempName(filename);
+  tempName += ".png";
   _sprite = new Sprite();
-  _sprite->LoadSprite(" ", tempName);
+  _sprite->LoadSprite(tempName);
 
   // I have no methods here, hopefully KonoM will have it
   // implemented real soon...
@@ -66,7 +65,7 @@ void AABB::CreateAABBFromSprite(const char* filename) {
   bool found = false;
   int color = 0;
   for(int width = 0; width < _sprite->GetWidth(); width++) {
-    for(int height = 0; height < _sprite->GetHeight; height++) {
+    for(int height = 0; height < _sprite->GetHeight(); height++) {
       DWORD offset;
     }
   }
diff --git a/src/Collision/AABB.h b/src/Collision/AABB.h
index bd2d029..0098673 100644
--- a/src/Collision/AABB.h
+++ b/src/Collision/AABB.h
@@ -26,7 +26,7 @@ public:
   void SetMin(Vec2 &min)                { SetMin(min.x, min.y); }
   void SetMin(float minX, float minY)   { _min.x = minX; _min.y = minY; _staticMin = _min; }
 
-  void SetRelitivePosition(float x, float y);
+  void SetRelativePosition(float x, float y);
   void SetPositionOffset(float x, float y);
   bool InCollision(AABB* otherAABB);
   void CreateAABBFromSprite(const char* filename);
diff --git a/src/Main/Game.cpp b/src/Main/Game.cpp
index 826e3c2..3914195 100644
--- a/src/Main/Game.cpp
+++ b/src/Main/Game.cpp
@@ -9,6 +9,7 @@
 #include "../System/Debug.h"
 #include "../Sprite/Sprite.h"
 #include "../Texture/Texture.h"
+#include "../Level/Level.h"
 #include "Game.h"
 
 Game::Game(void) {
diff --git a/src/Main/Game.h b/src/Main/Game.h
index 87486dd..0755563 100644
--- a/src/Main/Game.h
+++ b/src/Main/Game.h
@@ -3,6 +3,7 @@
 #include "../Actor/Player.h"
 
 class Sprite;
+class Level;
 
 class Game {
 public:
@@ -20,4 +21,5 @@ public:
 
 private:
   Player* _player;
+  Level* _level;
 };