From 11367621ef5a128a7bd4359e69a8b340491f80e4 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Thu, 12 Apr 2012 01:16:49 +0100 Subject: [PATCH] [Fix] Fixed KonoM's Qt project attempt. --- LibDQt/LibDQt.pro | 20 ++++++++++---------- src/Collision/AABB.cpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LibDQt/LibDQt.pro b/LibDQt/LibDQt.pro index c57aeed..2a1a82f 100644 --- a/LibDQt/LibDQt.pro +++ b/LibDQt/LibDQt.pro @@ -6,8 +6,8 @@ LIBS += -lGL \ -lSDL_gfx \ -ltinyxml \ -lGLU \ - -lz \ - -ltinyxml + -lz \ + -ltinyxml HEADERS += ../src/Actor/Player.h \ ../src/Global/Globals.h \ ../src/IO/Input.h \ @@ -28,22 +28,22 @@ HEADERS += ../src/Actor/Player.h \ ../src/Level/Map.h \ ../src/Level/Layer.h \ ../src/Level/Tileset.h \ - ../src/Level/Layer.h \ ../src/TMXParser/base64.h \ - ../src/TMXParser/Tmx.h \ + ../src/TMXParser/Tmx.h \ ../src/TMXParser/TmxImage.h \ ../src/TMXParser/TmxLayer.h \ ../src/TMXParser/TmxMap.h \ - ../src/TMXParser/TmxMapTile.h \ + ../src/TMXParser/TmxMapTile.h \ ../src/TMXParser/TmxObject.h \ ../src/TMXParser/TmxObjectGroup.h \ - ../src/TMXParser/TmxPoint.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/TMXParser/TmxUtil.h \ + ../src/Level/Layer.h \ SOURCES += ../src/Actor/Player.cpp \ ../src/Global/Globals.cpp \ ../src/IO/Input.cpp \ @@ -62,7 +62,6 @@ SOURCES += ../src/Actor/Player.cpp \ ../src/Level/Map.h \ ../src/Level/Layer.h \ ../src/Level/Tileset.h \ - ../src/Level/Layer.h \ ../src/TMXParser/base64.cpp \ ../src/TMXParser/TmxImage.cpp \ ../src/TMXParser/TmxLayer.cpp \ @@ -74,5 +73,6 @@ SOURCES += ../src/Actor/Player.cpp \ ../src/TMXParser/TmxPropertySet.cpp \ ../src/TMXParser/TmxTile.cpp \ ../src/TMXParser/TmxTileset.cpp \ - ../src/TMXParser/TmxUtil.cpp -OTHER_FILES += + ../src/TMXParser/TmxUtil.cpp \ + ../src/Level/Layer.cpp +OTHER_FILES += diff --git a/src/Collision/AABB.cpp b/src/Collision/AABB.cpp index e4b3994..ab6ca5f 100644 --- a/src/Collision/AABB.cpp +++ b/src/Collision/AABB.cpp @@ -58,8 +58,8 @@ void AABB::CreateAABBFromSprite(const char* filename) { // I have no methods here, hopefully KonoM will have it // implemented real soon... - float spriteWidth = _sprite->GetWidth(); - float spriteHeight = _sprite->GetHeight(); + //float spriteWidth = _sprite->GetWidth(); + //float spriteHeight = _sprite->GetHeight(); // Find the min, look through until we find a first instance of a white color. bool found = false;