summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-29 23:51:47 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-29 23:51:47 +0300
commit525a885c9cb55038edf5ab9215e25f908beb22af (patch)
tree87dc575e1e4d8f3c8b503512742244f27b15473f /src
parent1796dea741d75698a63beb4c105ffcd7a9415936 (diff)
downloadmanaplus-525a885c9cb55038edf5ab9215e25f908beb22af.tar.gz
manaplus-525a885c9cb55038edf5ab9215e25f908beb22af.tar.bz2
manaplus-525a885c9cb55038edf5ab9215e25f908beb22af.tar.xz
manaplus-525a885c9cb55038edf5ab9215e25f908beb22af.zip
Draw being smile over badge and animation effect.
Diffstat (limited to 'src')
-rw-r--r--src/being/being.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 23e4da309..0e1fbbc2f 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -1889,8 +1889,6 @@ void Being::drawEmotion(Graphics *const graphics,
{
const int px = getPixelX() - offsetX - mapTileSize / 2;
const int py = getPixelY() - offsetY - mapTileSize * 2 - mapTileSize;
- if (mEmotionSprite)
- mEmotionSprite->draw(graphics, px, py);
if (mAnimationEffect)
mAnimationEffect->draw(graphics, px, py);
if (mShowBadges && mBadgesCount)
@@ -1934,6 +1932,8 @@ void Being::drawEmotion(Graphics *const graphics,
// x += 16;
}
}
+ if (mEmotionSprite)
+ mEmotionSprite->draw(graphics, px, py);
}
void Being::drawSpeech(const int offsetX, const int offsetY)