diff --git a/LibDQt/LibDQt.pro b/LibDQt/LibDQt.pro index 882d006..e5329ff 100644 --- a/LibDQt/LibDQt.pro +++ b/LibDQt/LibDQt.pro @@ -8,7 +8,7 @@ LIBS += -lGL \ -ltinyxml \ -lSDL_mixer \ -lSDL_ttf -win32: { +win32: { LIBS -= -lGL \ -lGLU LIBS += -lkernel32 \ @@ -65,7 +65,9 @@ HEADERS += ../src/Actor/Player.h \ ../src/Animation/AnimatingSprite.h \ ../src/UI/Menu.h \ ../src/UI/Button.h \ - ../src/Main/TitleScreen.h + ../src/Main/TitleScreen.h \ + ../src/Level/Warp.h \ + ../src/Math/Rect.h SOURCES += ../src/Actor/Player.cpp \ ../src/Collision/AABB.cpp \ ../src/Global/Globals.cpp \ @@ -106,3 +108,4 @@ SOURCES += ../src/Actor/Player.cpp \ ../src/UI/Menu.cpp \ ../src/UI/Button.cpp \ ../src/Main/TitleScreen.cpp \ + ../src/Level/Warp.cpp diff --git a/src/Level/Level.cpp b/src/Level/Level.cpp index 123da3a..88da6cc 100644 --- a/src/Level/Level.cpp +++ b/src/Level/Level.cpp @@ -240,9 +240,9 @@ bool Level::CheckCollision(float x, float y, float w, float h) const { return false; } -Warp* Level::CheckWarp(float x, float y, float w, float h) const { +Warp* Level::CheckWarp(float x, float y, float w, float h) const { Rect objectArea(x, y, w, h); - for(std::list::const_iterator i = _warps.cbegin(); i != _warps.cend(); ++i) { + for(std::list::const_iterator i = _warps.begin(); i != _warps.end(); ++i) { Warp* warp = (*i); Rect warpArea( warp->GetX(), warp->GetY(), @@ -252,4 +252,4 @@ Warp* Level::CheckWarp(float x, float y, float w, float h) const { } } return NULL; -} \ No newline at end of file +}