From 0c35dab0ba366f85b40ef1795125521f1df8c264 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 28 Mar 2014 00:39:12 +0300
Subject: simplify variables cleanup.

---
 src/being/compoundsprite.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/being/compoundsprite.cpp')

diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp
index 63dd32fec..6c159821d 100644
--- a/src/being/compoundsprite.cpp
+++ b/src/being/compoundsprite.cpp
@@ -36,6 +36,7 @@
 #include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "utils/delete2.h"
 #include "utils/dtor.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
@@ -252,8 +253,7 @@ void CompoundSprite::removeSprite(const int layer)
     if (!mSprites.at(layer))
         return;
 
-    delete mSprites.at(layer);
-    mSprites.at(layer) = nullptr;
+    delete2(mSprites.at(layer));
     mNeedsRedraw = true;
 }
 
@@ -268,8 +268,7 @@ void CompoundSprite::clear()
     mNeedsRedraw = true;
     delete_all(imagesCache);
     imagesCache.clear();
-    delete mCacheItem;
-    mCacheItem = nullptr;
+    delete2(mCacheItem);
 }
 
 void CompoundSprite::ensureSize(size_t layerCount)
@@ -361,8 +360,7 @@ void CompoundSprite::redraw() const
 
     drawSpritesSDL(graphics, posX, posY);
 
-    delete graphics;
-    graphics = nullptr;
+    delete2(graphics);
 
     SDL_Surface *const surfaceA = MSDL_CreateRGBSurface(SDL_HWSURFACE,
         BUFFER_WIDTH, BUFFER_HEIGHT, 32, rmask, gmask, bmask, amask);
-- 
cgit v1.2.3-70-g09d2