summaryrefslogtreecommitdiff
path: root/src/maplayer.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-28 20:11:47 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-28 20:11:47 +0300
commit441a90b599613813f97f85537b7a05e628fba4cb (patch)
tree884b469df7eb5f0f48d773d60d18022837d81fb5 /src/maplayer.h
parent71ed8b67e2988e4452dde73643e8b609dc0a64cf (diff)
downloadmv-441a90b599613813f97f85537b7a05e628fba4cb.tar.gz
mv-441a90b599613813f97f85537b7a05e628fba4cb.tar.bz2
mv-441a90b599613813f97f85537b7a05e628fba4cb.tar.xz
mv-441a90b599613813f97f85537b7a05e628fba4cb.zip
move bools in maplayer.
Diffstat (limited to 'src/maplayer.h')
-rw-r--r--src/maplayer.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/maplayer.h b/src/maplayer.h
index 952dd6785..b36ab0cc7 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -173,17 +173,17 @@ class MapLayer final: public ConfigListener
const int endX, int &width) const A_WARN_UNUSED;
private:
- int mX, mY;
- int mWidth, mHeight;
- bool mIsFringeLayer; /**< Whether the actors are drawn. */
- bool mHighlightAttackRange;
+ int mX;
+ int mY;
+ int mWidth;
+ int mHeight;
Image **mTiles;
-// int *mTilesWidth;
-// int *mTilesCount;
SpecialLayer *mSpecialLayer;
SpecialLayer *mTempLayer;
typedef std::vector<MapRowVertexes*> MapRows;
MapRows mTempRows;
+ bool mIsFringeLayer; /**< Whether the actors are drawn. */
+ bool mHighlightAttackRange;
};
class SpecialLayer final
@@ -214,9 +214,10 @@ class SpecialLayer final
void clean() const;
private:
- int mWidth, mHeight;
- bool mDrawSprites;
+ int mWidth;
+ int mHeight;
MapItem **mTiles;
+ bool mDrawSprites;
};
class MapItem final
@@ -286,10 +287,10 @@ class MapItem final
const int dx, const int dy) const;
private:
- int mType;
Image *mImage;
std::string mComment;
std::string mName;
+ int mType;
int mX;
int mY;
};