From a69a87c5a81ddbf25a25c5549259da550d207bda Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 23 Jun 2012 02:46:01 +0300 Subject: Improve a bit iterators again. --- src/map.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/map.cpp') diff --git a/src/map.cpp b/src/map.cpp index bb35a53f1..0530b2702 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -662,8 +662,8 @@ bool Map::getWalk(int x, int y, unsigned char walkmask) const bool Map::occupied(int x, int y) const { const ActorSprites &actors = actorSpriteManager->getAll(); - ActorSpritesConstIterator it, it_end; - for (it = actors.begin(), it_end = actors.end(); it != it_end; ++it) + for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end(); + it != it_end; ++it) { const ActorSprite *actor = *it; @@ -1259,11 +1259,8 @@ void Map::updatePortalTile(const std::string &name, int type, MapItem *Map::findPortalXY(int x, int y) { - std::vector::const_iterator it; - std::vector::const_iterator it_end; - - for (it = mMapPortals.begin(), it_end = mMapPortals.end(); - it != it_end; ++it) + for (std::vector::const_iterator it = mMapPortals.begin(), + it_end = mMapPortals.end(); it != it_end; ++it) { if (!*it) continue; -- cgit v1.2.3-60-g2f50