diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-23 21:28:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-23 21:28:58 +0300 |
| commit | bd21d504d29099c021a0262f99079b5f9845a761 (patch) | |
| tree | 573531d649b0f21cad8e86bfdc4904b667ceb229 /src | |
| parent | 4b807a6184b3fcd9ba3df5d96f199917d88adc82 (diff) | |
| download | manaplus-bd21d504d29099c021a0262f99079b5f9845a761.tar.gz manaplus-bd21d504d29099c021a0262f99079b5f9845a761.tar.bz2 manaplus-bd21d504d29099c021a0262f99079b5f9845a761.tar.xz manaplus-bd21d504d29099c021a0262f99079b5f9845a761.zip | |
Remove some extra checks from mapreader.
Diffstat (limited to 'src')
| -rw-r--r-- | src/resources/mapreader.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 73317fcba..482ba032c 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -478,7 +478,7 @@ void MapReader::readProperties(const XmlNodePtrConst node, Properties *const props) { BLOCK_START("MapReader::readProperties") - if (!node || !props) + if (!node) { BLOCK_END("MapReader::readProperties") return; @@ -933,7 +933,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node, Map *const map) { BLOCK_START("MapReader::readTileset") - if (!map || !node) + if (!node) { BLOCK_END("MapReader::readTileset") return nullptr; @@ -1126,8 +1126,6 @@ Map *MapReader::createEmptyMap(const std::string &restrict filename, void MapReader::updateMusic(Map *const map) { - if (!map) - return; std::string name = map->getProperty("shortName"); const size_t p = name.rfind("."); if (p != std::string::npos) |