diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-10-21 20:31:25 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-10-21 20:31:25 +0300 |
commit | 27a943e95196a58103814edf3e4e3cd3a60ed8cd (patch) | |
tree | c68eedc10e7a1eba18d2c4209c8f7bc28e6673fd /src/resources/map | |
parent | 1888670781a0a8f4d14f58e5eab9173feeddfe46 (diff) | |
download | manaplus-27a943e95196a58103814edf3e4e3cd3a60ed8cd.tar.gz manaplus-27a943e95196a58103814edf3e4e3cd3a60ed8cd.tar.bz2 manaplus-27a943e95196a58103814edf3e4e3cd3a60ed8cd.tar.xz manaplus-27a943e95196a58103814edf3e4e3cd3a60ed8cd.zip |
Add map layer attribute TileCondition.
Diffstat (limited to 'src/resources/map')
-rw-r--r-- | src/resources/map/maplayer.cpp | 4 | ||||
-rw-r--r-- | src/resources/map/maplayer.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index 51691925b..57583aef9 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -47,7 +47,8 @@ MapLayer::MapLayer(const int x, const int y, const int width, const int height, const bool fringeLayer, - const int mask) : + const int mask, + const int tileCondition) : mX(x), mY(y), mWidth(width), @@ -58,6 +59,7 @@ MapLayer::MapLayer(const int x, const int y, mTempLayer(nullptr), mTempRows(), mMask(mask), + mTileCondition(tileCondition), mActorsFix(0), mIsFringeLayer(fringeLayer), mHighlightAttackRange(config.getBoolValue("highlightAttackRange")), diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h index 8c36fa771..2c1832691 100644 --- a/src/resources/map/maplayer.h +++ b/src/resources/map/maplayer.h @@ -60,7 +60,9 @@ class MapLayer final: public ConfigListener */ MapLayer(const int x, const int y, const int width, const int height, - const bool isFringeLayer, const int mask); + const bool isFringeLayer, + const int mask, + const int tileCondition); A_DELETE_COPY(MapLayer) @@ -166,6 +168,7 @@ class MapLayer final: public ConfigListener typedef std::vector<MapRowVertexes*> MapRows; MapRows mTempRows; int mMask; + int mTileCondition; int mActorsFix; const bool mIsFringeLayer; /**< Whether the actors are drawn. */ bool mHighlightAttackRange; |