diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-07-28 20:26:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-07-28 20:26:58 +0300 |
commit | 769e7987eb1ef269b0973923f335f3838f592a8c (patch) | |
tree | d88ceb35c5eabacf0da38de70f6df2de62f33b21 | |
parent | c1e75f8d55dddf4fa3740a2f879805533b00a02d (diff) | |
download | manaplus-769e7987eb1ef269b0973923f335f3838f592a8c.tar.gz manaplus-769e7987eb1ef269b0973923f335f3838f592a8c.tar.bz2 manaplus-769e7987eb1ef269b0973923f335f3838f592a8c.tar.xz manaplus-769e7987eb1ef269b0973923f335f3838f592a8c.zip |
move bools in compoundsprite.
-rw-r--r-- | src/compoundsprite.cpp | 6 | ||||
-rw-r--r-- | src/compoundsprite.h | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index a191afc59..748bf4d42 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -55,12 +55,12 @@ CompoundSprite::CompoundSprite() : mAlphaImage(nullptr), mOffsetX(0), mOffsetY(0), + mSprites(), + mNextRedrawTime(0), mNeedsRedraw(false), mEnableAlphaFix(config.getBoolValue("enableAlphaFix")), mDisableAdvBeingCaching(config.getBoolValue("disableAdvBeingCaching")), - mDisableBeingCaching(config.getBoolValue("disableBeingCaching")), - mSprites(), - mNextRedrawTime(0) + mDisableBeingCaching(config.getBoolValue("disableBeingCaching")) { mAlpha = 1.0f; } diff --git a/src/compoundsprite.h b/src/compoundsprite.h index 6049cdeb9..0c7dc3034 100644 --- a/src/compoundsprite.h +++ b/src/compoundsprite.h @@ -147,16 +147,15 @@ private: mutable Image *mImage; mutable Image *mAlphaImage; - mutable int mOffsetX, mOffsetY; - + mutable int mOffsetX; + mutable int mOffsetY; + std::vector<Sprite*> mSprites; + mutable int mNextRedrawTime; + static bool mEnableDelay; mutable bool mNeedsRedraw; - bool mEnableAlphaFix; bool mDisableAdvBeingCaching; bool mDisableBeingCaching; - std::vector<Sprite*> mSprites; - mutable int mNextRedrawTime; - static bool mEnableDelay; }; #endif // COMPOUNDSPRITE_H |