From 84d3121bfbf5f413812a85966bfe1cc1ac240576 Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Thu, 12 Apr 2012 02:29:57 +0100
Subject: [PATCH] [Fix] Fixed Qt's project file.

---
 LibDQt/LibDQt.pro    | 83 +++++++++++++++++++++-----------------------
 src/Actor/Player.cpp | 12 +++++--
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/LibDQt/LibDQt.pro b/LibDQt/LibDQt.pro
index 24b0550..b7b750c 100644
--- a/LibDQt/LibDQt.pro
+++ b/LibDQt/LibDQt.pro
@@ -9,11 +9,19 @@ LIBS += -lGL \
     -lz \
     -ltinyxml
 HEADERS += ../src/Actor/Player.h \
+    ../src/Collision/AABB.h \
+    ../src/Global/Constants.h \
     ../src/Global/Globals.h \
     ../src/IO/Input.h \
-    ../src/Main/Game.h \
+    ../src/Level/MapTile.h \
+    ../src/Level/Level.h \
+    ../src/Level/Layer.h \
+    ../src/Level/Tileset.h \
     ../src/Main/LGLXWindow.h \
+    ../src/Main/GLWindow.h \
+    ../src/Main/Game.h \
     ../src/Math/Timer.h \
+    ../src/Math/Rect.h \
     ../src/Math/MathBox.h \
     ../src/Math/FPS.h \
     ../src/Math/Vec2.h \
@@ -21,59 +29,48 @@ HEADERS += ../src/Actor/Player.h \
     ../src/System/Debug.h \
     ../src/System/ResourceManager.h \
     ../src/Texture/Texture.h \
-    ../src/Global/Constants.h \
-    ../src/Collision/AABB.h \
-    ../src/Level/Level.h \
-    ../src/Level/MapTile.h \
-    ../src/Level/Map.h \
-    ../src/Level/Layer.h \
-    ../src/Level/Tileset.h \
-    ../src/TMXParser/base64.h \
-    ../src/TMXParser/Tmx.h \
-    ../src/TMXParser/TmxImage.h \
-    ../src/TMXParser/TmxLayer.h \
-    ../src/TMXParser/TmxMap.h \
-    ../src/TMXParser/TmxMapTile.h \
-    ../src/TMXParser/TmxObject.h \
-    ../src/TMXParser/TmxObjectGroup.h \
-    ../src/TMXParser/TmxPoint.h \
-    ../src/TMXParser/TmxPolygon.h \
-    ../src/TMXParser/TmxPolyline.h \
-    ../src/TMXParser/TmxPropertySet.h \
-    ../src/TMXParser/TmxTile.h \
-    ../src/TMXParser/TmxTileset.h \
     ../src/TMXParser/TmxUtil.h \
-    ../src/Level/Layer.h \
+    ../src/TMXParser/TmxTileset.h \
+    ../src/TMXParser/TmxTile.h \
+    ../src/TMXParser/TmxPropertySet.h \
+    ../src/TMXParser/TmxPolyline.h \
+    ../src/TMXParser/TmxPolygon.h \
+    ../src/TMXParser/TmxObjectGroup.h \
+    ../src/TMXParser/TmxObject.h \
+    ../src/TMXParser/TmxMapTile.h \
+    ../src/TMXParser/TmxImage.h \
+    ../src/TMXParser/TmxPoint.h \
+    ../src/TMXParser/TmxMap.h \
+    ../src/TMXParser/TmxLayer.h \
+    ../src/TMXParser/Tmx.h \
+    ../src/TMXParser/base64.h
 SOURCES += ../src/Actor/Player.cpp \
+    ../src/Collision/AABB.cpp \
     ../src/Global/Globals.cpp \
     ../src/Global/Constants.cpp \
     ../src/IO/Input.cpp \
-    ../src/Main/main.cpp \
+    ../src/Level/Tileset.cpp \
+    ../src/Level/Level.cpp \
+    ../src/Level/Layer.cpp \
     ../src/Main/LGLXWindow.cpp \
+    ../src/Main/GLWindow.cpp \
     ../src/Main/Game.cpp \
+    ../src/Main/main.cpp \
     ../src/Math/Vec2.cpp \
     ../src/Math/Timer.cpp \
     ../src/Math/FPS.cpp \
     ../src/Sprite/Sprite.cpp \
     ../src/System/Debug.cpp \
     ../src/Texture/Texture.cpp \
-    ../src/Collision/AABB.cpp \
-    ../src/Level/Level.h \
-    ../src/Level/MapTile.h \
-    ../src/Level/Map.h \
-    ../src/Level/Layer.h \
-    ../src/Level/Tileset.h \
-    ../src/TMXParser/base64.cpp \
-    ../src/TMXParser/TmxImage.cpp \
-    ../src/TMXParser/TmxLayer.cpp \
-    ../src/TMXParser/TmxMap.cpp \
-    ../src/TMXParser/TmxObject.cpp \
-    ../src/TMXParser/TmxObjectGroup.cpp \
-    ../src/TMXParser/TmxPolygon.cpp \
-    ../src/TMXParser/TmxPolyline.cpp \
-    ../src/TMXParser/TmxPropertySet.cpp \
-    ../src/TMXParser/TmxTile.cpp \
-    ../src/TMXParser/TmxTileset.cpp \
     ../src/TMXParser/TmxUtil.cpp \
-    ../src/Level/Layer.cpp
-OTHER_FILES +=
+    ../src/TMXParser/TmxTileset.cpp \
+    ../src/TMXParser/TmxTile.cpp \
+    ../src/TMXParser/TmxPropertySet.cpp \
+    ../src/TMXParser/TmxPolyline.cpp \
+    ../src/TMXParser/TmxPolygon.cpp \
+    ../src/TMXParser/TmxObjectGroup.cpp \
+    ../src/TMXParser/TmxObject.cpp \
+    ../src/TMXParser/TmxMap.cpp \
+    ../src/TMXParser/TmxLayer.cpp \
+    ../src/TMXParser/TmxImage.cpp \
+    ../src/TMXParser/base64.cpp
diff --git a/src/Actor/Player.cpp b/src/Actor/Player.cpp
index 50c0637..796864b 100644
--- a/src/Actor/Player.cpp
+++ b/src/Actor/Player.cpp
@@ -15,7 +15,7 @@ Player::Player(void) {
 
   _environmentCollisionBound = new AABB();
   _environmentCollisionBound->SetMin(_collisionBound->GetMin().x, _collisionBound->GetMax().y - 50.0f);
-  _environmentCollisionBound->SetMax(_collisionBound->GetMax());
+  //_environmentCollisionBound->SetMax(_collisionBound->GetMax());
 }
 
 Player::~Player(void) {
@@ -26,7 +26,7 @@ Player::~Player(void) {
 void Player::Update(void) {
   // Position and collision bound with the player.
   _collisionBound->SetPositionOffset(_player->GetX(), _player->GetY());
-  _environmentCollisionBound->SetPositionOffset(_player->GetX, _player->GetY());
+  //_environmentCollisionBound->SetPositionOffset(_player->GetX, _player->GetY());
 
   // Time to process the collisions.
   ProcessCollisions();
@@ -61,6 +61,14 @@ void Player::ProcessCollisions(void) {
   // I'll do this tomorrow now.
 }
 
+void Player::EntityCollisionTest(void) {
+
+}
+
+void Player::ActorCollisionTest(void) {
+
+}
+
 void Player::ProcessEvents(void) {
   x = _player->GetX();
   y = _player->GetY();