summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-15 22:38:57 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-15 22:38:57 +0300
commit407a4233221c2280ef2a92914c8d23e463aa665c (patch)
treeba069236bf9c57e8fce100e12242b8f82ad486b1 /src/resources
parent8a70dcea8686a6b0e161143f19f9a53a8223ef68 (diff)
downloadplus-407a4233221c2280ef2a92914c8d23e463aa665c.tar.gz
plus-407a4233221c2280ef2a92914c8d23e463aa665c.tar.bz2
plus-407a4233221c2280ef2a92914c8d23e463aa665c.tar.xz
plus-407a4233221c2280ef2a92914c8d23e463aa665c.zip
Fix draw map layers before switching map modes.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/map.cpp5
-rw-r--r--src/resources/mapreader.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 9f4feb87b..aa7248c8d 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -1551,8 +1551,11 @@ void Map::updateDrawLayersList()
void Map::setMask(const int mask)
{
if (mask != mMask)
+ {
mRedrawMap = true;
- mMask = mask;
+ mMask = mask;
+ updateDrawLayersList();
+ }
}
void Map::setMusicFile(const std::string &file)
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 7b21cd1d0..825be9a25 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -461,8 +461,8 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path)
map->reduce();
map->setWalkLayer(resman->getWalkLayer(fileName, map));
unloadTempLayers();
- BLOCK_END("MapReader::readMap xml")
map->updateDrawLayersList();
+ BLOCK_END("MapReader::readMap xml")
return map;
}