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/utils/chatutils.cpp | |
parent | f1518dd8476c968a43fa57cfb06198e290a4f77a (diff) | |
download | manaverse-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.gz manaverse-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.bz2 manaverse-36ba43d6ea38062b17f7e63ef659962bfc51c64d.tar.xz manaverse-36ba43d6ea38062b17f7e63ef659962bfc51c64d.zip |
Fix clang-tidy check readability-implicit-bool-cast.
Diffstat (limited to 'src/utils/chatutils.cpp')
-rw-r--r-- | src/utils/chatutils.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp index 456fc4233..53bb689a4 100644 --- a/src/utils/chatutils.cpp +++ b/src/utils/chatutils.cpp @@ -46,10 +46,10 @@ void outStringNormal(ChatTab *const tab, const std::string &str, const std::string &def) { - if (!localPlayer) + if (localPlayer == nullptr) return; - if (!tab) + if (tab == nullptr) { chatHandler->talk(str, GENERAL_CHANNEL); return; @@ -65,7 +65,7 @@ void outStringNormal(ChatTab *const tab, case ChatTabType::GUILD: { const Guild *const guild = localPlayer->getGuild(); - if (guild) + if (guild != nullptr) { #ifdef TMWA_SUPPORT if (guild->getServerGuild()) @@ -74,7 +74,7 @@ void outStringNormal(ChatTab *const tab, return; guildHandler->chat(str); } - else if (guildManager) + else if (guildManager != nullptr) { guildManager->chat(str); } @@ -111,18 +111,18 @@ void outStringNormal(ChatTab *const tab, void replaceVars(std::string &str) { - if (!localPlayer || !actorManager) + if ((localPlayer == nullptr) || (actorManager == nullptr)) return; if (str.find("<PLAYER>") != std::string::npos) { const Being *target = localPlayer->getTarget(); - if (!target || target->getType() != ActorType::Player) + if ((target == nullptr) || target->getType() != ActorType::Player) { target = actorManager->findNearestLivingBeing( localPlayer, 20, ActorType::Player, AllowSort_true); } - if (target) + if (target != nullptr) replaceAll(str, "<PLAYER>", target->getName()); else replaceAll(str, "<PLAYER>", ""); @@ -130,12 +130,12 @@ void replaceVars(std::string &str) if (str.find("<MONSTER>") != std::string::npos) { const Being *target = localPlayer->getTarget(); - if (!target || target->getType() != ActorType::Monster) + if ((target == nullptr) || target->getType() != ActorType::Monster) { target = actorManager->findNearestLivingBeing( localPlayer, 20, ActorType::Monster, AllowSort_true); } - if (target) + if (target != nullptr) replaceAll(str, "<MONSTER>", target->getName()); else replaceAll(str, "<MONSTER>", ""); @@ -167,7 +167,7 @@ void replaceVars(std::string &str) std::string newStr; const Party *party = nullptr; if (localPlayer->isInParty() && - (party = localPlayer->getParty())) + ((party = localPlayer->getParty()) != nullptr)) { party->getNames(names); FOR_EACH (StringVectCIter, it, names) |