summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-21 23:11:05 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-21 23:22:06 +0300
commit67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf (patch)
tree0efb80c3cf13e5f859c522da923cf7fddac90bc5 /src/being.cpp
parent73f36dd1934b3d0cdd52f13cab15480de4d0b9d2 (diff)
downloadManaVerse-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.gz
ManaVerse-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.bz2
ManaVerse-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.tar.xz
ManaVerse-67d5177ef4f5d54ea8edc5403ed20f9ade56e8bf.zip
fix code style and some other fixes after auto checks.
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/being.cpp b/src/being.cpp
index d5012ac06..e8f6566f0 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -2794,6 +2794,8 @@ void Being::setEmote(const uint8_t emotion, const int emote_time)
mEmotionSprite = AnimatedSprite::clone(sprite->sprite);
if (mEmotionSprite)
mEmotionTime = info->time;
+ else
+ mEmotionTime = emote_time;
}
}
}