diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-06 18:45:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-06 19:04:03 +0300 |
| commit | eab637f57db36a104815217a432416d852d141a6 (patch) | |
| tree | 53e747c467b57e7dc8950096293642876c5976b0 | |
| parent | 1d563a171844af47aa013519618ad018d2b194ea (diff) | |
| download | manaplus-eab637f57db36a104815217a432416d852d141a6.tar.gz manaplus-eab637f57db36a104815217a432416d852d141a6.tar.bz2 manaplus-eab637f57db36a104815217a432416d852d141a6.tar.xz manaplus-eab637f57db36a104815217a432416d852d141a6.zip | |
Report in map reader if loaded tilesets not included into atlases.
| -rw-r--r-- | src/resources/map/map.h | 3 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 99e5002a7..c658b9b30 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -375,6 +375,9 @@ class Map final : public Properties, std::string getCounterName() const override final { return mName; } + bool haveAtlas() const + { return mAtlas != nullptr; } + protected: friend class Actor; friend class Minimap; diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 1736c0cd5..67ce2f465 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -1063,9 +1063,21 @@ Tileset *MapReader::readTileset(XmlNodePtr node, if (tilebmp) { - set = new Tileset(tilebmp, tw, th, firstGid, margin, - spacing); + set = new Tileset(tilebmp, + tw, th, + firstGid, + margin, + spacing); tilebmp->decRef(); +#ifdef USE_OPENGL + if (tilebmp->getType() == ImageType::Image && + map->haveAtlas() == true && + graphicsManager.getUseAtlases()) + { + reportAlways("Error: image '%s' not present in atlas", + source.c_str()); + } +#endif } else { |