summaryrefslogtreecommitdiff
path: root/src/being.h
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-11-03 23:50:35 -0400
committerChuck Miller <shadowmil@gmail.com>2010-11-07 23:26:37 -0500
commitc81b3c269e39700be94fd9e2629b0bdfb0d093f8 (patch)
treec4dbca3f9dbb288151fec3171089e12295d33e04 /src/being.h
parent671a465fa2c9469bde36b78c49e84bd0325c4cf1 (diff)
downloadmana-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.gz
mana-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.bz2
mana-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.tar.xz
mana-c81b3c269e39700be94fd9e2629b0bdfb0d093f8.zip
Convert the emote system to use particles
Reviewed-by: Jared Adams
Diffstat (limited to 'src/being.h')
-rw-r--r--src/being.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/being.h b/src/being.h
index 0d1816f9..94790f5f 100644
--- a/src/being.h
+++ b/src/being.h
@@ -322,11 +322,6 @@ class Being : public ActorSprite, public ConfigListener, public Mana::Listener
*/
void drawSpeech(int offsetX, int offsetY);
- /**
- * Draws the emotion picture above the being.
- */
- void drawEmotion(Graphics *graphics, int offsetX, int offsetY);
-
Uint16 getSubType() const { return mSubType; }
/**
@@ -444,22 +439,6 @@ class Being : public ActorSprite, public ConfigListener, public Mana::Listener
*/
const Path &getPath() const { return mPath; }
- /**
- * Set the Emoticon type and time displayed above
- * the being.
- */
- void setEmote(Uint8 emotion, Uint8 emote_time)
- {
- mEmotion = emotion;
- mEmotionTime = emote_time;
- }
-
- /**
- * Get the current Emoticon type displayed above
- * the being.
- */
- Uint8 getEmotion() const { return mEmotion; }
-
static void load();
virtual void optionChanged(const std::string &value);
@@ -527,8 +506,6 @@ class Being : public ActorSprite, public ConfigListener, public Mana::Listener
int mActionTime; /**< Time spent in current action */
- int mEmotion; /**< Currently showing emotion */
- int mEmotionTime; /**< Time until emotion disappears */
/** Time until the last speech sentence disappears */
int mSpeechTime;