diff options
| author | Ira Rice <irarice@gmail.com> | 2008-10-15 15:23:21 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-10-15 15:23:21 +0000 |
| commit | d3f84af9d22814db0ec67e87805b3d1054afd606 (patch) | |
| tree | 9ee8fa2f0cb9b85da65bfebd0f2f74cbf8fbf20e /src/being.h | |
| parent | 0ce8857e4e3fbd69c48f7db9123293bdcbcd9751 (diff) | |
| download | mana-d3f84af9d22814db0ec67e87805b3d1054afd606.tar.gz mana-d3f84af9d22814db0ec67e87805b3d1054afd606.tar.bz2 mana-d3f84af9d22814db0ec67e87805b3d1054afd606.tar.xz mana-d3f84af9d22814db0ec67e87805b3d1054afd606.zip | |
De-hardcoded colors in trunk. Now, all colors are loaded from
colors.xml.
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/being.h b/src/being.h index 05a49d9a..f5f1a1a7 100644 --- a/src/being.h +++ b/src/being.h @@ -36,8 +36,9 @@ #include "gui/speechbubble.h" +#include "resources/colordb.h" + #define NR_HAIR_STYLES 10 -#define NR_HAIR_COLORS 16 #define FIRST_IGNORE_EMOTE 14 @@ -362,6 +363,7 @@ class Being : public Sprite const std::auto_ptr<Equipment> mEquipment; + protected: /** * Sets the new path for this being. @@ -389,6 +391,7 @@ class Being : public Sprite std::string mName; /**< Name of character */ SpriteIterator mSpriteIterator; bool mIsGM; + bool mParticleEffects; /**< Whether to display particles or not */ /** Engine-related infos about weapon. */ const ItemInfo* mEquippedWeapon; @@ -405,9 +408,6 @@ class Being : public Sprite std::vector<std::string> mSpriteColors; std::list<Particle *> mChildParticleEffects; - protected: - bool mParticleEffects; /**< Whether to display particles or not */ - private: /** * Calculates the offset in the given directions. |