From 27a943e95196a58103814edf3e4e3cd3a60ed8cd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 21 Oct 2015 20:31:25 +0300 Subject: Add map layer attribute TileCondition. --- src/resources/map/maplayer.cpp | 4 +++- src/resources/map/maplayer.h | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/resources/map') 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 MapRows; MapRows mTempRows; int mMask; + int mTileCondition; int mActorsFix; const bool mIsFringeLayer; /**< Whether the actors are drawn. */ bool mHighlightAttackRange; -- cgit v1.2.3-60-g2f50