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/mercenarydb.cpp | |
| parent | f1518dd8476c968a43fa57cfb06198e290a4f77a (diff) | |
| download | plus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.gz plus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.bz2 plus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.xz plus-36ba43d6ea38062b17f7e63ef659962bfc51c64d.zip | |
Fix clang-tidy check readability-implicit-bool-cast.
Diffstat (limited to 'src/resources/db/mercenarydb.cpp')
| -rw-r--r-- | src/resources/db/mercenarydb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index bc1b20840..a528c7def 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -60,7 +60,7 @@ void MercenaryDB::loadXmlFile(const std::string &fileName, skipError); XmlNodeConstPtr rootNode = doc.rootNode(); - if (!rootNode || !xmlNameEqual(rootNode, "mercenaries")) + if ((rootNode == nullptr) || !xmlNameEqual(rootNode, "mercenaries")) { logger->log("MercenaryDB: Error while loading %s!", paths.getStringValue("mercenariesFile").c_str()); @@ -92,7 +92,7 @@ void MercenaryDB::loadXmlFile(const std::string &fileName, logger->log("MercenaryDB: Redefinition of mercenary ID %d", id); currentInfo = mMercenaryInfos[fromInt(id + offset, BeingTypeId)]; } - if (!currentInfo) + if (currentInfo == nullptr) currentInfo = new BeingInfo; currentInfo->setBlockType(BlockType::NONE); @@ -111,7 +111,7 @@ void MercenaryDB::loadXmlFile(const std::string &fileName, currentInfo->setColorsList(XML::getProperty(mercenaryNode, "colors", "")); - if (currentInfo->getMaxHP()) + if (currentInfo->getMaxHP() != 0) currentInfo->setStaticMaxHP(true); SpriteDisplay display; |