diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-18 18:37:19 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-18 18:37:19 +0100 |
| commit | 1231406e5c9ac43d60c6ffb0ae664970b0e4eee0 (patch) | |
| tree | 45af35e9a6ee56b71f06d76efa7706bf16eaec9a /src/being.h | |
| parent | 04c189cf7e3e8a393c81bfb3e11058ceace8802a (diff) | |
| parent | 4bd8d3fd96fab681ee4520b6a6f2a6ee73f6eb97 (diff) | |
| download | mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.gz mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.bz2 mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.xz mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/being.h b/src/being.h index 754c163a..ec6f1c44 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,10 +507,10 @@ 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; + const gcn::Color* mNameColor; std::vector<AnimatedSprite*> mSprites; std::vector<int> mSpriteIDs; @@ -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 |