diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-09 00:18:08 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-09 00:18:08 +0300 |
| commit | c6ac11341bd99cbe5eeb4275b9b2473e21338d5e (patch) | |
| tree | bb7589c232ad54bfd037ae016ee0991342ebccfa /src/being | |
| parent | 9f1470325518a8ee5b6c0c2c1254ab4dccac0f63 (diff) | |
| download | plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.gz plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.bz2 plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.xz plus-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.zip | |
Fix code style.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 7 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 3 |
2 files changed, 7 insertions, 3 deletions
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) { |