diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-12 06:44:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-12 06:44:16 -0600 |
| commit | e2d60401eaf55abe9e2251854f3174ffe0f4ad9e (patch) | |
| tree | 99be0ae61a6b4c97cafeb6458491f38cb7904d8a /src/being.h | |
| parent | 2eb027b0f7a67706df68fe29e605c5be7fc1d5c9 (diff) | |
| download | mana-e2d60401eaf55abe9e2251854f3174ffe0f4ad9e.tar.gz mana-e2d60401eaf55abe9e2251854f3174ffe0f4ad9e.tar.bz2 mana-e2d60401eaf55abe9e2251854f3174ffe0f4ad9e.tar.xz mana-e2d60401eaf55abe9e2251854f3174ffe0f4ad9e.zip | |
Move emote sprite loading into EmoteDB
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/being.h b/src/being.h index 754c163a..b9b57a0d 100644 --- a/src/being.h +++ b/src/being.h @@ -392,8 +392,6 @@ class Being : public Sprite */ void untarget() { mUsedTargetCursor = NULL; } - AnimatedSprite* getEmote(int index) { return emotionSet[index]; } - void setEmote(Uint8 emotion, Uint8 emote_time) { mEmotion = emotion; @@ -447,8 +445,6 @@ class Being : public Sprite static void load(); - static void cleanup(); - protected: /** * Sets the new path for this being. @@ -511,7 +507,7 @@ class Being : public Sprite Uint16 mHairStyle, mHairColor; Gender mGender; int mPx, mPy; /**< Pixel coordinates */ - Uint16 mStunMode; /**< Stun mode; zero if not stunned */ + Uint16 mStunMode; /**< Stun mode; zero if not stunned */ std::set<int> mStatusEffects; /**< set of active status effects */ gcn::Color mNameColor; @@ -524,8 +520,6 @@ class Being : public Sprite ParticleList mChildParticleEffects; private: - static void initializeHair(); - /** * Calculates the offset in the given directions. * If walking in direction 'neg' the value is negated. @@ -540,8 +534,6 @@ class Being : public Sprite // Target cursor being used SimpleAnimation* mUsedTargetCursor; - - static std::vector<AnimatedSprite*> emotionSet; /**< Emoticons used by beings */ }; #endif |