From e469ab2f1940cb04b53bb3b72cc7b5a0cd0669b0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 18 Aug 2016 18:51:15 +0300 Subject: Add some clang fixes. --- src/resources/db/mapdb.cpp | 4 ++-- src/resources/mapreader.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/resources') diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp index 48d234bb4..fde608496 100644 --- a/src/resources/db/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -213,11 +213,11 @@ const MapInfo *MapDB::getMapAtlas(const std::string &name) const MapInfo *MapDB::getAtlas(const std::string &name) { - MapInfo *const info = new MapInfo; - const AtlasCIter it = mAtlases.find(name); if (it == mAtlases.end()) return nullptr; + + MapInfo *const info = new MapInfo; info->atlas = name; info->files = &(*it).second; return info; diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 0b06fb455..5c6282135 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -1199,7 +1199,12 @@ Tileset *MapReader::readTileset(XmlNodePtr node, const int duration = XML::getProperty( frameNode, "duration", 0) / 10; - ani->addFrame(set->get(tileId), duration, 0, 0, 100); + if (set) + { + ani->addFrame(set->get(tileId), + duration, + 0, 0, 100); + } } } -- cgit v1.2.3-70-g09d2