diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2007-05-04 13:09:25 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2007-05-04 13:09:25 +0000 |
| commit | 00fb4bde7974a20aacfc1c52e48fff2faee2d385 (patch) | |
| tree | 2097ef003495d7e6b4a8cf697ad7896039aac113 /src/being.h | |
| parent | b3376bfe4e26591e1dc1066d8f2270baf4f9f759 (diff) | |
| download | mana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.tar.gz mana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.tar.bz2 mana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.tar.xz mana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.zip | |
Merged particle engine into main eAthena branch.
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/being.h b/src/being.h index 08b0e710..5dbd845b 100644 --- a/src/being.h +++ b/src/being.h @@ -42,6 +42,7 @@ class Item; class Map; class Graphics; class ImageSet; +class Particle; /** * A position along a being's path. @@ -351,6 +352,12 @@ class Being : public Sprite std::auto_ptr<Equipment> mEquipment; + /** + * Take control of a particle + */ + void + controlParticle(Particle *particle); + protected: /** * Sets the new path for this being. @@ -380,15 +387,14 @@ class Being : public Sprite Path mPath; std::string mSpeech; - std::string mDamage; Uint16 mHairStyle, mHairColor; Uint8 mSex; Uint32 mSpeechTime; - Uint32 mDamageTime; Sint32 mPx, mPy; /**< Pixel coordinates */ std::vector<AnimatedSprite*> mSprites; std::vector<int> mEquipmentSpriteIDs; + std::list<Particle *> mChildParticleEffects; private: static int instances; /**< Number of Being instances */ |