summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-28 00:39:12 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-28 11:04:23 +0300
commit0c35dab0ba366f85b40ef1795125521f1df8c264 (patch)
treedde6abde3288f543ae96a2468b2275af8a03e704 /src/map.cpp
parent47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff)
downloadManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz
ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2
ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz
ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.zip
simplify variables cleanup.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/map.cpp b/src/map.cpp
index c86c51bce..b4112231d 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -42,6 +42,7 @@
#include "resources/resourcemanager.h"
#include "resources/subimage.h"
+#include "utils/delete2.h"
#include "utils/dtor.h"
#include "utils/mkdir.h"
#include "utils/physfstools.h"
@@ -98,8 +99,7 @@ TileAnimation::TileAnimation(Animation *const ani):
TileAnimation::~TileAnimation()
{
- delete mAnimation;
- mAnimation = nullptr;
+ delete2(mAnimation);
}
bool TileAnimation::update(const int ticks)
@@ -202,7 +202,6 @@ Map::~Map()
config.removeListeners(this);
CHECKLISTENERS
- // delete metadata, layers, tilesets and overlays
delete [] mMetaTiles;
for (int i = 0; i < NB_BLOCKTYPES; i++)
delete [] mOccupation[i];
@@ -218,20 +217,16 @@ Map::~Map()
delete_all(mForegrounds);
delete_all(mBackgrounds);
delete_all(mTileAnimations);
- delete mSpecialLayer;
- mSpecialLayer = nullptr;
- delete mTempLayer;
- mTempLayer = nullptr;
- delete mObjects;
- mObjects = nullptr;
+ delete2(mSpecialLayer);
+ delete2(mTempLayer);
+ delete2(mObjects);
delete_all(mMapPortals);
if (mAtlas)
{
mAtlas->decRef();
mAtlas = nullptr;
}
- delete mHeights;
- mHeights = nullptr;
+ delete2(mHeights);
}
void Map::optionChanged(const std::string &value)