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/npcdb.cpp | |
| parent | f1518dd8476c968a43fa57cfb06198e290a4f77a (diff) | |
| download | mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.gz mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.bz2 mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.xz mv-36ba43d6ea38062b17f7e63ef659962bfc51c64d.zip | |
Fix clang-tidy check readability-implicit-bool-cast.
Diffstat (limited to 'src/resources/db/npcdb.cpp')
| -rw-r--r-- | src/resources/db/npcdb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp index 9be217819..44a0bc747 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -63,7 +63,7 @@ void NPCDB::loadXmlFile(const std::string &fileName, XML::Document doc(fileName, UseVirtFs_true, skipError); XmlNodeConstPtrConst rootNode = doc.rootNode(); - if (!rootNode || !xmlNameEqual(rootNode, "npcs")) + if ((rootNode == nullptr) || !xmlNameEqual(rootNode, "npcs")) { logger->log("NPC Database: Error while loading %s!", paths.getStringValue("npcsFile").c_str()); @@ -99,7 +99,7 @@ void NPCDB::loadXmlFile(const std::string &fileName, logger->log("NpcDB: Redefinition of npc ID %d", toInt(id, int)); currentInfo = mNPCInfos[id]; } - if (!currentInfo) + if (currentInfo == nullptr) currentInfo = new BeingInfo; currentInfo->setTargetSelection(XML::getBoolProperty(npcNode, @@ -198,7 +198,7 @@ BeingInfo *NPCDB::get(const BeingTypeId id) BeingTypeId NPCDB::getAvatarFor(const BeingTypeId id) { const BeingInfo *const info = get(id); - if (!info) + if (info == nullptr) return BeingTypeId_zero; return info->getAvatarId(); } |