diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-07-28 22:31:59 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-07-28 22:31:59 +0300 |
commit | c3505b360ee56486acdbb4f26e0b76f610ce92d1 (patch) | |
tree | 09f01f5214a200f2f466de1e87b77cf357cd8c42 | |
parent | 880389de48e669ba75c86f1530b7e491e40e9325 (diff) | |
download | plus-c3505b360ee56486acdbb4f26e0b76f610ce92d1.tar.gz plus-c3505b360ee56486acdbb4f26e0b76f610ce92d1.tar.bz2 plus-c3505b360ee56486acdbb4f26e0b76f610ce92d1.tar.xz plus-c3505b360ee56486acdbb4f26e0b76f610ce92d1.zip |
move bools in actorsprite.
-rw-r--r-- | src/actorsprite.cpp | 8 | ||||
-rw-r--r-- | src/actorsprite.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index f22a0f1da..1e3f0ba07 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -49,15 +49,15 @@ bool ActorSprite::loaded = false; ActorSprite::ActorSprite(const int id) : CompoundSprite(), Actor(), - mId(id), - mStunMode(0), mStatusEffects(), mStunParticleEffects(), mStatusParticleEffects(&mStunParticleEffects, false), mChildParticleEffects(&mStatusParticleEffects, false), - mMustResetParticles(false), + mId(id), + mStunMode(0), mUsedTargetCursor(nullptr), - mActorSpriteListeners() + mActorSpriteListeners(), + mMustResetParticles(false) { } diff --git a/src/actorsprite.h b/src/actorsprite.h index badcb3b2d..345f4a31f 100644 --- a/src/actorsprite.h +++ b/src/actorsprite.h @@ -208,18 +208,15 @@ protected: const int imageType = 0, const std::string &color = ""); - int mId; - uint16_t mStunMode; /**< Stun mode; zero if not stunned */ std::set<int> mStatusEffects; /**< set of active status effects */ ParticleList mStunParticleEffects; ParticleVector mStatusParticleEffects; ParticleList mChildParticleEffects; + int mId; + uint16_t mStunMode; /**< Stun mode; zero if not stunned */ private: - /** Reset particle status effects on next redraw? */ - bool mMustResetParticles; - /** Load the target cursors into memory */ static void initTargetCursor(); @@ -247,6 +244,9 @@ private: typedef std::list<ActorSpriteListener*> ActorSpriteListeners; typedef ActorSpriteListeners::iterator ActorSpriteListenerIterator; ActorSpriteListeners mActorSpriteListeners; + + /** Reset particle status effects on next redraw? */ + bool mMustResetParticles; }; #endif // ACTORSPRITE_H |