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 @@
+
+
@@ -118,8 +120,10 @@
+
+
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 @@
{5bd696ec-579f-4271-9d4b-0f1fdd8b651c}
+
+ {9cc417fe-d5fd-47c3-8442-d545c358b7c2}
+
+
+ {27a35a1b-7725-467a-aeb8-d169c437676e}
+
@@ -129,6 +135,12 @@
System
+
+ Level
+
+
+ Collision
+
@@ -203,5 +215,11 @@
TMXParser
+
+ Level
+
+
+ Collision
+
\ 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;
};