diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-29 18:43:33 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-29 18:45:18 +0300 |
commit | 373e404d20dd75e46b14451164c0914df100e236 (patch) | |
tree | 94686df259dc4b498175081a949d4fd4566185b4 /src/resources/map | |
parent | 10fcab46c31bb5c5b44416e6b3bb497e9434f352 (diff) | |
download | manaverse-373e404d20dd75e46b14451164c0914df100e236.tar.gz manaverse-373e404d20dd75e46b14451164c0914df100e236.tar.bz2 manaverse-373e404d20dd75e46b14451164c0914df100e236.tar.xz manaverse-373e404d20dd75e46b14451164c0914df100e236.zip |
Add name into MapLayer memory object.
Diffstat (limited to 'src/resources/map')
-rw-r--r-- | src/resources/map/maplayer.cpp | 4 | ||||
-rw-r--r-- | src/resources/map/maplayer.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index 03901d00a..5d81cfb09 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -46,7 +46,8 @@ #include "debug.h" -MapLayer::MapLayer(const int x, +MapLayer::MapLayer(const std::string &name, + const int x, const int y, const int width, const int height, @@ -63,6 +64,7 @@ MapLayer::MapLayer(const int x, mDrawLayerFlags(MapType::NORMAL), mSpecialLayer(nullptr), mTempLayer(nullptr), + mName(name), mTempRows(), mMask(mask), mTileCondition(tileCondition), diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h index dc48fc2ef..8aa692549 100644 --- a/src/resources/map/maplayer.h +++ b/src/resources/map/maplayer.h @@ -63,7 +63,8 @@ class MapLayer final: public MemoryCounter, public ConfigListener * fringe layer. The fringe layer is the layer that draws the actors. * There can be only one fringe layer per map. */ - MapLayer(const int x, + MapLayer(const std::string &name, + const int x, const int y, const int width, const int height, @@ -168,6 +169,9 @@ class MapLayer final: public MemoryCounter, public ConfigListener int calcMemoryChilds(const int level) const override final; + std::string getCounterName() const override final + { return mName; } + protected: static int getTileDrawWidth(const TileInfo *restrict img, const int endX, @@ -188,6 +192,7 @@ class MapLayer final: public MemoryCounter, public ConfigListener MapTypeT mDrawLayerFlags; const SpecialLayer *restrict mSpecialLayer; const SpecialLayer *restrict mTempLayer; + const std::string mName; typedef std::vector<MapRowVertexes*> MapRows; MapRows mTempRows; int mMask; |