diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-07 18:37:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-07 18:37:50 +0300 |
| commit | 3dbdda0d3070a093f8a341f897ce4310a8b52bd2 (patch) | |
| tree | ddb5a48767c97cbb95e8204acfeb667483477051 /src/resources/map/map.cpp | |
| parent | 3173688b7c1a1027257aa057039bd50738ac8bb5 (diff) | |
| download | manaverse-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.tar.gz manaverse-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.tar.bz2 manaverse-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.tar.xz manaverse-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.zip | |
Add some missing nonnull attributes to map/maplayer classes.
Diffstat (limited to 'src/resources/map/map.cpp')
| -rw-r--r-- | src/resources/map/map.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index b2697ddcf..ada25e3d6 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -163,8 +163,6 @@ Map::~Map() config.removeListeners(this); CHECKLISTENERS - delete [] mMetaTiles; - if (mWalkLayer) { mWalkLayer->decRef(); @@ -186,6 +184,7 @@ Map::~Map() mAtlas = nullptr; } delete2(mHeights); + delete [] mMetaTiles; } void Map::optionChanged(const std::string &restrict value) restrict2 @@ -298,9 +297,6 @@ void Map::addLayer(MapLayer *const layer) restrict2 void Map::addTileset(Tileset *const tileset) restrict2 { - if (!tileset) - return; - mTilesets.push_back(tileset); const int height = tileset->getHeight(); if (height > mMaxTileHeight) |