diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-06 23:34:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-07 19:23:40 +0300 |
| commit | 36ba43d6ea38062b17f7e63ef659962bfc51c64d (patch) | |
| tree | 190156cb88b13a38a6d13c69ee0742cc078065a1 /src/resources/db/monsterdb.cpp | |
| parent | f1518dd8476c968a43fa57cfb06198e290a4f77a (diff) | |
| download | manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.gz manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.bz2 manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.xz manaplus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.zip | |
Fix clang-tidy check readability-implicit-bool-cast.
Diffstat (limited to 'src/resources/db/monsterdb.cpp')
| -rw-r--r-- | src/resources/db/monsterdb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 1ed0caa27..44b430144 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -62,7 +62,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName, XML::Document doc(fileName, UseVirtFs_true, skipError); XmlNodeConstPtr rootNode = doc.rootNode(); - if (!rootNode || !xmlNameEqual(rootNode, "monsters")) + if ((rootNode == nullptr) || !xmlNameEqual(rootNode, "monsters")) { logger->log("Monster Database: Error while loading %s!", paths.getStringValue("monstersFile").c_str()); @@ -94,7 +94,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName, logger->log("MonsterDB: Redefinition of monster ID %d", id); currentInfo = mMonsterInfos[fromInt(id + offset, BeingTypeId)]; } - if (!currentInfo) + if (currentInfo == nullptr) currentInfo = new BeingInfo; currentInfo->setBlockType(BlockType::NONE); @@ -114,7 +114,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName, currentInfo->setColorsList(XML::getProperty(monsterNode, "colors", "")); - if (currentInfo->getMaxHP()) + if (currentInfo->getMaxHP() != 0) currentInfo->setStaticMaxHP(true); SpriteDisplay display; |