From 975f12cdaa4bba66c0e1e18aa3d638f3ae8cad76 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 3 Mar 2015 18:26:17 +0300 Subject: Use riding sprite actions in being. --- src/being/actorsprite.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/being/actorsprite.h') diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index 12624aa30..e0c64b017 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -177,7 +177,7 @@ class ActorSprite notfinal : public CompoundSprite, public Actor bool getHaveCart() const A_WARN_UNUSED { return mHaveCart; } - virtual void setRiding(const bool b) + void setRiding(const bool b) { mRiding = b; } protected: @@ -207,15 +207,6 @@ class ActorSprite notfinal : public CompoundSprite, public Actor const int imageType = 0, const std::string &color = ""); - std::set mStatusEffects; /**< set of active status effects */ - - ParticleList mStunParticleEffects; - ParticleVector mStatusParticleEffects; - ParticleList mChildParticleEffects; - int mId; - uint16_t mStunMode; /**< Stun mode; zero if not stunned */ - - private: /** Load the target cursors into memory */ static void initTargetCursor(); @@ -228,6 +219,14 @@ class ActorSprite notfinal : public CompoundSprite, public Actor static bool loaded; + std::set mStatusEffects; /**< set of active status effects */ + + ParticleList mStunParticleEffects; + ParticleVector mStatusParticleEffects; + ParticleList mChildParticleEffects; + int mId; + uint16_t mStunMode; /**< Stun mode; zero if not stunned */ + /** Target cursor being used */ AnimatedSprite *mUsedTargetCursor; -- cgit v1.2.3-60-g2f50