summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2020-02-23 09:30:51 +0300
committerAndrei Karas <akaras@inbox.ru>2020-02-23 09:30:51 +0300
commit1e2a88e975019929c4c7e3154537865cc09550a6 (patch)
treeae8bc68ad3a3f6b61a5e2d511d7fc17daa22bd0e /src/being
parent6941fd4eeb1dce20aba8c42fd030c2690c37b731 (diff)
downloadplus-1e2a88e975019929c4c7e3154537865cc09550a6.tar.gz
plus-1e2a88e975019929c4c7e3154537865cc09550a6.tar.bz2
plus-1e2a88e975019929c4c7e3154537865cc09550a6.tar.xz
plus-1e2a88e975019929c4c7e3154537865cc09550a6.zip
Fix some code style issues
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/being/localplayer.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 0459d83e9..072d1f30a 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -650,11 +650,11 @@ void Being::setSpeech(const std::string &restrict text) restrict2
}
else
{
- const bool isShowName = (speech == BeingSpeech::NAME_IN_BUBBLE);
if (mSpeechBubble == nullptr)
createSpeechBubble();
if (mSpeechBubble != nullptr)
{
+ const bool isShowName = (speech == BeingSpeech::NAME_IN_BUBBLE);
mSpeechBubble->setCaption(isShowName ? mName : "",
&theme->getColor(ThemeColorId::BUBBLE_NAME, 255),
&theme->getColor(ThemeColorId::BUBBLE_NAME_OUTLINE, 255));
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 55808ecda..449032a40 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1101,9 +1101,11 @@ void LocalPlayer::handleStatusEffect(const StatusEffect *const effect,
if (!found)
{ // add new
- const int offset = CAST_S32(mStatusEffectIcons.size());
if (miniStatusWindow != nullptr)
+ {
+ const int offset = CAST_S32(mStatusEffectIcons.size());
miniStatusWindow->setIcon(offset, sprite);
+ }
mStatusEffectIcons.push_back(effectId);
}
}