From 36ba43d6ea38062b17f7e63ef659962bfc51c64d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jun 2017 23:34:34 +0300 Subject: Fix clang-tidy check readability-implicit-bool-cast. --- src/being/actor.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/being/actor.cpp') diff --git a/src/being/actor.cpp b/src/being/actor.cpp index 9039c0128..a881c005e 100644 --- a/src/being/actor.cpp +++ b/src/being/actor.cpp @@ -37,7 +37,7 @@ Actor::Actor() : Actor::~Actor() { - if (mMap) + if (mMap != nullptr) { mMap->removeActor(mMapActor); mMap = nullptr; @@ -47,28 +47,34 @@ Actor::~Actor() void Actor::setMap(Map *const map) { // Remove Actor from potential previous map - if (mMap) + if (mMap != nullptr) mMap->removeActor(mMapActor); mMap = map; // Add Actor to potential new map - if (mMap) + if (mMap != nullptr) mMapActor = mMap->addActor(this); } int Actor::getTileX() const { - if (!mMap || !mMap->getTileWidth()) + if (mMap == nullptr || + mMap->getTileWidth() == 0) + { return 0; + } return getPixelX() / mMap->getTileWidth(); } int Actor::getTileY() const { - if (!mMap || !mMap->getTileHeight()) + if (mMap == nullptr || + mMap->getTileHeight() == 0) + { return 0; + } return getPixelY() / mMap->getTileHeight(); } -- cgit v1.2.3-70-g09d2