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

[Fix] cbegin() and cend() are not nice on Linux.

Browse Source
This commit is contained in:
Rtch90 2012-04-22 16:48:56 +01:00
parent 1c37fb6344
commit 4ba792cc18
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LibDQt/LibDQt.pro
View File

@ -65,7 +65,9 @@ HEADERS += ../src/Actor/Player.h \
../src/Animation/AnimatingSprite.h \ ../src/Animation/AnimatingSprite.h \
../src/UI/Menu.h \ ../src/UI/Menu.h \
../src/UI/Button.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 \ SOURCES += ../src/Actor/Player.cpp \
../src/Collision/AABB.cpp \ ../src/Collision/AABB.cpp \
../src/Global/Globals.cpp \ ../src/Global/Globals.cpp \
@ -106,3 +108,4 @@ SOURCES += ../src/Actor/Player.cpp \
../src/UI/Menu.cpp \ ../src/UI/Menu.cpp \
../src/UI/Button.cpp \ ../src/UI/Button.cpp \
../src/Main/TitleScreen.cpp \ ../src/Main/TitleScreen.cpp \
../src/Level/Warp.cpp

2
src/Level/Level.cpp
View File

@ -242,7 +242,7 @@ bool Level::CheckCollision(float x, float y, float w, float h) const {
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); Rect objectArea(x, y, w, h);
for(std::list<Warp*>::const_iterator i = _warps.cbegin(); i != _warps.cend(); ++i) { for(std::list<Warp*>::const_iterator i = _warps.begin(); i != _warps.end(); ++i) {
Warp* warp = (*i); Warp* warp = (*i);
Rect warpArea( Rect warpArea(
warp->GetX(), warp->GetY(), warp->GetX(), warp->GetY(),