diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-16 18:22:32 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-16 18:22:32 +0300 |
commit | 124cc470b5d66a7e2d1b2f49b5cccc0832db6779 (patch) | |
tree | b7def5f3d2c3b222f059bb1624beb00a691daefc /src/resources/map/map.cpp | |
parent | 66f0468b3c2e8bd9ff26f082c9a57b77188d6e54 (diff) | |
download | manaplus-124cc470b5d66a7e2d1b2f49b5cccc0832db6779.tar.gz manaplus-124cc470b5d66a7e2d1b2f49b5cccc0832db6779.tar.bz2 manaplus-124cc470b5d66a7e2d1b2f49b5cccc0832db6779.tar.xz manaplus-124cc470b5d66a7e2d1b2f49b5cccc0832db6779.zip |
Remove parameter from fringe layer draw function.
Diffstat (limited to 'src/resources/map/map.cpp')
-rw-r--r-- | src/resources/map/map.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 49006a5b2..4927485d4 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -393,8 +393,11 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) { mFringeLayer->setSpecialLayer(mSpecialLayer); mFringeLayer->setTempLayer(mTempLayer); - mFringeLayer->drawFringe(graphics, startX, startY, endX, endY, - scrollX, scrollY, &mActors, mActorFixY); + mFringeLayer->drawFringe(graphics, + startX, startY, + endX, endY, + scrollX, scrollY, + &mActors); } } else @@ -423,8 +426,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) startX, startY, endX, endY, scrollX, scrollY, - &mActors, - mActorFixY); + &mActors); } FOR_EACH (Layers::iterator, it, mDrawOverLayers) @@ -459,7 +461,7 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) startX, startY, endX, endY, scrollX, scrollY, - &mActors, mActorFixY); + &mActors); } FOR_EACH (Layers::iterator, it, mDrawOverLayers) @@ -1611,3 +1613,11 @@ void Map::setDrawLayersFlags(const MapType::MapType &n) layer->setDrawLayerFlags(mDrawLayersFlags); } } + +void Map::setActorsFix(const int x, const int y) +{ + mActorFixX = x; + mActorFixY = y; + if (mFringeLayer) + mFringeLayer->setActorsFix(y); +} |