Rtch/LibD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Allanis/LibD

Browse Source
This commit is contained in:
Tamir Atias 2012-04-12 03:54:15 +03:00
commit 06ee0fbdda
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
LibDQt/LibDQt.pro
View File

@ -6,8 +6,8 @@ LIBS += -lGL \
-lSDL_gfx \ -lSDL_gfx \
-ltinyxml \ -ltinyxml \
-lGLU \ -lGLU \
-lz \ -lz \
-ltinyxml -ltinyxml
HEADERS += ../src/Actor/Player.h \ HEADERS += ../src/Actor/Player.h \
../src/Global/Globals.h \ ../src/Global/Globals.h \
../src/IO/Input.h \ ../src/IO/Input.h \
@ -28,22 +28,22 @@ HEADERS += ../src/Actor/Player.h \
../src/Level/Map.h \ ../src/Level/Map.h \
../src/Level/Layer.h \ ../src/Level/Layer.h \
../src/Level/Tileset.h \ ../src/Level/Tileset.h \
../src/Level/Layer.h \
../src/TMXParser/base64.h \ ../src/TMXParser/base64.h \
../src/TMXParser/Tmx.h \ ../src/TMXParser/Tmx.h \
../src/TMXParser/TmxImage.h \ ../src/TMXParser/TmxImage.h \
../src/TMXParser/TmxLayer.h \ ../src/TMXParser/TmxLayer.h \
../src/TMXParser/TmxMap.h \ ../src/TMXParser/TmxMap.h \
../src/TMXParser/TmxMapTile.h \ ../src/TMXParser/TmxMapTile.h \
../src/TMXParser/TmxObject.h \ ../src/TMXParser/TmxObject.h \
../src/TMXParser/TmxObjectGroup.h \ ../src/TMXParser/TmxObjectGroup.h \
../src/TMXParser/TmxPoint.h \ ../src/TMXParser/TmxPoint.h \
../src/TMXParser/TmxPolygon.h \ ../src/TMXParser/TmxPolygon.h \
../src/TMXParser/TmxPolyline.h \ ../src/TMXParser/TmxPolyline.h \
../src/TMXParser/TmxPropertySet.h \ ../src/TMXParser/TmxPropertySet.h \
../src/TMXParser/TmxTile.h \ ../src/TMXParser/TmxTile.h \
../src/TMXParser/TmxTileset.h \ ../src/TMXParser/TmxTileset.h \
../src/TMXParser/TmxUtil.h ../src/TMXParser/TmxUtil.h \
../src/Level/Layer.h \
SOURCES += ../src/Actor/Player.cpp \ SOURCES += ../src/Actor/Player.cpp \
../src/Global/Globals.cpp \ ../src/Global/Globals.cpp \
../src/Global/Constants.cpp \ ../src/Global/Constants.cpp \
@ -63,7 +63,6 @@ SOURCES += ../src/Actor/Player.cpp \
../src/Level/Map.h \ ../src/Level/Map.h \
../src/Level/Layer.h \ ../src/Level/Layer.h \
../src/Level/Tileset.h \ ../src/Level/Tileset.h \
../src/Level/Layer.h \
../src/TMXParser/base64.cpp \ ../src/TMXParser/base64.cpp \
../src/TMXParser/TmxImage.cpp \ ../src/TMXParser/TmxImage.cpp \
../src/TMXParser/TmxLayer.cpp \ ../src/TMXParser/TmxLayer.cpp \
@ -75,5 +74,6 @@ SOURCES += ../src/Actor/Player.cpp \
../src/TMXParser/TmxPropertySet.cpp \ ../src/TMXParser/TmxPropertySet.cpp \
../src/TMXParser/TmxTile.cpp \ ../src/TMXParser/TmxTile.cpp \
../src/TMXParser/TmxTileset.cpp \ ../src/TMXParser/TmxTileset.cpp \
../src/TMXParser/TmxUtil.cpp ../src/TMXParser/TmxUtil.cpp \
../src/Level/Layer.cpp
OTHER_FILES += OTHER_FILES +=

4
src/Collision/AABB.cpp
View File

@ -58,8 +58,8 @@ void AABB::CreateAABBFromSprite(const char* filename) {
// I have no methods here, hopefully KonoM will have it // I have no methods here, hopefully KonoM will have it
// implemented real soon... // implemented real soon...
float spriteWidth = _sprite->GetWidth(); //float spriteWidth = _sprite->GetWidth();
float spriteHeight = _sprite->GetHeight(); //float spriteHeight = _sprite->GetHeight();
// Find the min, look through until we find a first instance of a white color. // Find the min, look through until we find a first instance of a white color.
bool found = false; bool found = false;