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/particle/textparticle.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/particle/textparticle.cpp')
-rw-r--r-- | src/particle/textparticle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/particle/textparticle.cpp b/src/particle/textparticle.cpp index 84eb4f8ef..cf4da05f4 100644 --- a/src/particle/textparticle.cpp +++ b/src/particle/textparticle.cpp @@ -38,7 +38,7 @@ TextParticle::TextParticle(const std::string &restrict text, mText(text), mTextFont(font), mColor(color), - mTextWidth(mTextFont ? mTextFont->getWidth(mText) / 2 : 1), + mTextWidth(mTextFont != nullptr ? mTextFont->getWidth(mText) / 2 : 1), mOutline(outline) { mType = ParticleType::Text; @@ -61,13 +61,13 @@ void TextParticle::draw(Graphics *restrict const graphics, float alpha = mAlpha * 255.0F; - if (mFadeOut && mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut) + if ((mFadeOut != 0) && mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut) { alpha *= static_cast<float>(mLifetimeLeft) / static_cast<float>(mFadeOut); } - if (mFadeIn && mLifetimePast < mFadeIn) + if ((mFadeIn != 0) && mLifetimePast < mFadeIn) { alpha *= static_cast<float>(mLifetimePast) / static_cast<float>(mFadeIn); |