Merge branch 'master' of 192.168.1.106:/home/pi/data/git/dungeon-gunner

This commit is contained in:
Felix Ableitner 2013-09-12 19:40:08 +02:00
commit 14d5347e6f
2 changed files with 4 additions and 4 deletions

View file

@ -230,14 +230,14 @@ Pathfinder::getArea(const Vector2f& point) const {
/** /**
* Draws areas. * Draws areas.
*/ */
#ifndef RELEASE
void void
Pathfinder::draw(sf::RenderTarget& target, sf::RenderStates states) const { Pathfinder::draw(sf::RenderTarget& target, sf::RenderStates states) const {
#ifndef RELEASE
for (auto& area : mAreas) { for (auto& area : mAreas) {
sf::RectangleShape rect(Vector2f(area.area.width, area.area.height)); sf::RectangleShape rect(Vector2f(area.area.width, area.area.height));
rect.setPosition(Vector2f(area.area.left, area.area.top)); rect.setPosition(Vector2f(area.area.left, area.area.top));
rect.setFillColor(sf::Color(area.area.width * 30, 127, 0, 96)); rect.setFillColor(sf::Color(area.area.width * 30, 127, 0, 96));
target.draw(rect); target.draw(rect);
} }
}
#endif /* RELEASE */ #endif /* RELEASE */
}

View file

@ -381,9 +381,9 @@ Generator::findClosestFloor(const Vector2i& start) const {
* *
* mPaths is only required for this function. * mPaths is only required for this function.
*/ */
#ifndef RELEASE
void void
Generator::draw(sf::RenderTarget& target, sf::RenderStates states) const { Generator::draw(sf::RenderTarget& target, sf::RenderStates states) const {
#ifndef RELEASE
for (auto& p : mPaths) { for (auto& p : mPaths) {
for (auto&q : p) { for (auto&q : p) {
sf::RectangleShape rect(Vector2f(Tile::TILE_SIZE)); sf::RectangleShape rect(Vector2f(Tile::TILE_SIZE));
@ -392,5 +392,5 @@ Generator::draw(sf::RenderTarget& target, sf::RenderStates states) const {
target.draw(rect); target.draw(rect);
} }
} }
}
#endif /* RELEASE */ #endif /* RELEASE */
}