summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-05 15:53:11 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-05 15:53:11 +0300
commit10fc389814be7d0c6f4af3842046bd200f57212d (patch)
tree05edfb106fc4d9241b5f1af96649608350ce6da5
parent504d0d19d10f7ba609c3467b807abc7c7a889789 (diff)
downloadmv-10fc389814be7d0c6f4af3842046bd200f57212d.tar.gz
mv-10fc389814be7d0c6f4af3842046bd200f57212d.tar.bz2
mv-10fc389814be7d0c6f4af3842046bd200f57212d.tar.xz
mv-10fc389814be7d0c6f4af3842046bd200f57212d.zip
Fix erased players hide emotes and spech over head.
-rw-r--r--src/being/being.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 76b9de904..d167f4408 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2078,6 +2078,9 @@ void Being::drawEmotion(Graphics *restrict const graphics,
const int offsetX,
const int offsetY) const restrict2
{
+ if (mErased)
+ return;
+
const int px = mPixelX - offsetX - mapTileSize / 2;
const int py = mPixelY - offsetY - mapTileSize * 2 - mapTileSize;
if (mAnimationEffect)
@@ -2119,6 +2122,8 @@ void Being::drawEmotion(Graphics *restrict const graphics,
void Being::drawSpeech(const int offsetX,
const int offsetY) restrict2
{
+ if (mErased)
+ return;
if (mSpeech.empty())
return;