diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-06-26 00:01:41 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-06-26 00:01:41 +0300 |
commit | afbcfe595044767a44055473ce07df1f0fd63dbb (patch) | |
tree | 79c961af92309ab4ae20aedcbede80ada3fe5018 /src/resources/map | |
parent | 482782d74c61e226ed1ce81700708244565291f5 (diff) | |
download | manaverse-afbcfe595044767a44055473ce07df1f0fd63dbb.tar.gz manaverse-afbcfe595044767a44055473ce07df1f0fd63dbb.tar.bz2 manaverse-afbcfe595044767a44055473ce07df1f0fd63dbb.tar.xz manaverse-afbcfe595044767a44055473ce07df1f0fd63dbb.zip |
Add missing checks into map directory.
Diffstat (limited to 'src/resources/map')
-rw-r--r-- | src/resources/map/map.cpp | 6 | ||||
-rw-r--r-- | src/resources/map/maplayer.cpp | 9 | ||||
-rw-r--r-- | src/resources/map/maplayer.h | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 6c27a9a87..19a6b3e08 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -399,7 +399,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) startX, startY, endX, endY, scrollX, scrollY, - &mActors); + mActors); } } else @@ -436,7 +436,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) startX, startY, endX, endY, scrollX, scrollY, - &mActors); + mActors); } FOR_EACH (Layers::iterator, it, mDrawOverLayers) @@ -461,7 +461,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) startX, startY, endX, endY, scrollX, scrollY, - &mActors); + mActors); } FOR_EACH (Layers::iterator, it, mDrawOverLayers) diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index 03afd6012..666df1b4a 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -353,10 +353,11 @@ void MapLayer::drawOGL(Graphics *const graphics) const } #endif -void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY, +void MapLayer::drawFringe(Graphics *const graphics, + int startX, int startY, int endX, int endY, const int scrollX, const int scrollY, - const Actors *const actors) const + const Actors &actors) const { BLOCK_START("MapLayer::drawFringe") if (!localPlayer || !mSpecialLayer || !mTempLayer) @@ -379,8 +380,8 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY, if (endY > mHeight) endY = mHeight; - ActorsCIter ai = actors->begin(); - const ActorsCIter ai_end = actors->end(); + ActorsCIter ai = actors.begin(); + const ActorsCIter ai_end = actors.end(); const int dx = (mX * mapTileSize) - scrollX; const int dy = (mY * mapTileSize) - scrollY + mapTileSize; diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h index 6588e0303..be17804d8 100644 --- a/src/resources/map/maplayer.h +++ b/src/resources/map/maplayer.h @@ -123,7 +123,7 @@ class MapLayer final: public ConfigListener int endY, const int scrollX, const int scrollY, - const Actors *const actors) const A_NONNULL(2); + const Actors &actors) const A_NONNULL(2); bool isFringeLayer() const A_WARN_UNUSED { return mIsFringeLayer; } |