summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-28 03:58:21 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-28 03:58:21 +0300
commit0a58e4d746fe3845040cce79659072fd0a31e094 (patch)
treebe5230f467d8da7b2e3e371f02a5ffe07376dd44
parent3e026f7efc76b0e6e76177d04c989432cb517b7a (diff)
downloadmanaplus-0a58e4d746fe3845040cce79659072fd0a31e094.tar.gz
manaplus-0a58e4d746fe3845040cce79659072fd0a31e094.tar.bz2
manaplus-0a58e4d746fe3845040cce79659072fd0a31e094.tar.xz
manaplus-0a58e4d746fe3845040cce79659072fd0a31e094.zip
Dont show "error" for emotes.
-rw-r--r--src/being.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 2d8bc042c..664eecd1d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1380,8 +1380,10 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast())
{
- if (EmoteDB::getAnimation(emotionIndex))
+ if (EmoteDB::getAnimation(emotionIndex, true))
EmoteDB::getAnimation(emotionIndex)->draw(graphics, px, py);
+ else
+ mEmotion = 0;
}
}