From c6ac11341bd99cbe5eeb4275b9b2473e21338d5e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 9 Jun 2017 00:18:08 +0300 Subject: Fix code style. --- src/being/being.cpp | 7 +++++-- src/being/localplayer.cpp | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/being') diff --git a/src/being/being.cpp b/src/being/being.cpp index 9029b5ae1..fb19b2f61 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1522,7 +1522,7 @@ void Being::setAction(const BeingActionT &restrict action, } else { - if ((mInfo == nullptr) || (mInfo->getAttack(attackId) == nullptr)) + if (mInfo == nullptr || mInfo->getAttack(attackId) == nullptr) break; currentAction = getAttackAction(mInfo->getAttack(attackId)); @@ -2305,8 +2305,11 @@ void Being::drawSpeech(const int offsetX, // Draw speech above this being if (mSpeechTime == 0) { - if ((mSpeechBubble != nullptr) && mSpeechBubble->mVisible == Visible_true) + if (mSpeechBubble != nullptr && + mSpeechBubble->mVisible == Visible_true) + { mSpeechBubble->setVisible(Visible_false); + } mSpeech.clear(); } else if (mSpeechTime > 0 && (speech == BeingSpeech::NAME_IN_BUBBLE || diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 061945c0c..c0f4caa80 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -2584,7 +2584,8 @@ void LocalPlayer::setRealPos(const int x, const int y) { const MapItem *const mapItem = layer->getTile(x, y); - if ((mapItem == nullptr) || mapItem->getType() == MapItemType::EMPTY) + if (mapItem == nullptr || + mapItem->getType() == MapItemType::EMPTY) { if (mX != x && mY != y) { -- cgit v1.2.3-60-g2f50