diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/maplayer.cpp | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/maplayer.cpp')
| -rw-r--r-- | src/maplayer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/maplayer.cpp b/src/maplayer.cpp index 67df3930b..1f8278304 100644 --- a/src/maplayer.cpp +++ b/src/maplayer.cpp @@ -43,7 +43,7 @@ #include "debug.h" MapLayer::MapLayer(const int x, const int y, const int width, const int height, - const bool fringeLayer): + const bool fringeLayer, const int mask): mX(x), mY(y), mWidth(width), @@ -52,6 +52,7 @@ MapLayer::MapLayer(const int x, const int y, const int width, const int height, mSpecialLayer(nullptr), mTempLayer(nullptr), mTempRows(), + mMask(mask), mIsFringeLayer(fringeLayer), mHighlightAttackRange(config.getBoolValue("highlightAttackRange")) { @@ -63,6 +64,7 @@ MapLayer::MapLayer(const int x, const int y, const int width, const int height, MapLayer::~MapLayer() { config.removeListener("highlightAttackRange", this); + CHECKLISTENERS delete [] mTiles; delete_all(mTempRows); mTempRows.clear(); |