summaryrefslogtreecommitdiff
path: root/src/being/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-09 00:18:08 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-09 00:18:08 +0300
commitc6ac11341bd99cbe5eeb4275b9b2473e21338d5e (patch)
treebb7589c232ad54bfd037ae016ee0991342ebccfa /src/being/being.cpp
parent9f1470325518a8ee5b6c0c2c1254ab4dccac0f63 (diff)
downloadmv-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.gz
mv-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.bz2
mv-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.tar.xz
mv-c6ac11341bd99cbe5eeb4275b9b2473e21338d5e.zip
Fix code style.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp7
1 files changed, 5 insertions, 2 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 ||