diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-04 22:08:55 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-04 22:08:55 +0300 |
commit | 4ad3a8e89e64ce3ae845d2786dd433ab2682393e (patch) | |
tree | 80234ae2e147686b822bd2579f9cbc0756aa2f90 /src/being.h | |
parent | 5066c50c2869d3f8b13138947eaa3f52accc5ad0 (diff) | |
download | manaplus-4ad3a8e89e64ce3ae845d2786dd433ab2682393e.tar.gz manaplus-4ad3a8e89e64ce3ae845d2786dd433ab2682393e.tar.bz2 manaplus-4ad3a8e89e64ce3ae845d2786dd433ab2682393e.tar.xz manaplus-4ad3a8e89e64ce3ae845d2786dd433ab2682393e.zip |
Add support for animated emotes.
Not particles but really animated emotes.
First frame used as icon.
Diffstat (limited to 'src/being.h')
-rw-r--r-- | src/being.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/being.h b/src/being.h index 2757ea06c..88fcae859 100644 --- a/src/being.h +++ b/src/being.h @@ -600,13 +600,6 @@ class Being : public ActorSprite, public ConfigListener void setState(const uint8_t state); - /** - * Get the current Emoticon type displayed above - * the being. - */ - int getEmotion() const A_WARN_UNUSED - { return mEmotion; } - virtual void drawSprites(Graphics *const graphics, int posX, int posY) const override; @@ -891,8 +884,9 @@ class Being : public ActorSprite, public ConfigListener int mActionTime; /**< Time spent in current action */ - int mEmotion; /**< Currently showing emotion */ + AnimatedSprite *mEmotionSprite; int mEmotionTime; /**< Time until emotion disappears */ + /** Time until the last speech sentence disappears */ int mSpeechTime; @@ -905,6 +899,7 @@ class Being : public ActorSprite, public ConfigListener uint8_t mDirectionDelayed; /**< Facing direction */ uint8_t mSpriteDirection; /**< Facing direction */ + std::string mSpriteAction; std::string mName; /**< Name of character */ std::string mRaceName; std::string mPartyName; |