summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-23 21:28:58 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-23 21:28:58 +0300
commitbd21d504d29099c021a0262f99079b5f9845a761 (patch)
tree573531d649b0f21cad8e86bfdc4904b667ceb229
parent4b807a6184b3fcd9ba3df5d96f199917d88adc82 (diff)
downloadmv-bd21d504d29099c021a0262f99079b5f9845a761.tar.gz
mv-bd21d504d29099c021a0262f99079b5f9845a761.tar.bz2
mv-bd21d504d29099c021a0262f99079b5f9845a761.tar.xz
mv-bd21d504d29099c021a0262f99079b5f9845a761.zip
Remove some extra checks from mapreader.
-rw-r--r--src/resources/mapreader.cpp6
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)