diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-03-28 00:39:12 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-03-28 11:04:23 +0300 |
commit | 0c35dab0ba366f85b40ef1795125521f1df8c264 (patch) | |
tree | dde6abde3288f543ae96a2468b2275af8a03e704 /src/particle | |
parent | 47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff) | |
download | manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2 manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.zip |
simplify variables cleanup.
Diffstat (limited to 'src/particle')
-rw-r--r-- | src/particle/animationparticle.cpp | 5 | ||||
-rw-r--r-- | src/particle/particlecontainer.cpp | 7 | ||||
-rw-r--r-- | src/particle/rotationalparticle.cpp | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/particle/animationparticle.cpp b/src/particle/animationparticle.cpp index 4381ceb8a..dccd3d037 100644 --- a/src/particle/animationparticle.cpp +++ b/src/particle/animationparticle.cpp @@ -24,6 +24,8 @@ #include "simpleanimation.h" +#include "utils/delete2.h" + #include "debug.h" AnimationParticle::AnimationParticle(Animation *const animation) : @@ -41,8 +43,7 @@ AnimationParticle::AnimationParticle(XmlNodePtrConst animationNode, AnimationParticle::~AnimationParticle() { - delete mAnimation; - mAnimation = nullptr; + delete2(mAnimation); mImage = nullptr; } diff --git a/src/particle/particlecontainer.cpp b/src/particle/particlecontainer.cpp index 0c73d2762..07eb36dc4 100644 --- a/src/particle/particlecontainer.cpp +++ b/src/particle/particlecontainer.cpp @@ -23,6 +23,8 @@ #include "particle/particle.h" #include "particle/particlecontainer.h" +#include "utils/delete2.h" + #include "debug.h" typedef std::list<Particle *>::iterator ParticleListIter; @@ -40,10 +42,7 @@ ParticleContainer::~ParticleContainer() // +++ call virtul method in destructor clearLocally(); if (mDelParent) - { - delete mNext; - mNext = nullptr; - } + delete2(mNext) } void ParticleContainer::clear() diff --git a/src/particle/rotationalparticle.cpp b/src/particle/rotationalparticle.cpp index 2a1fe7904..976234f83 100644 --- a/src/particle/rotationalparticle.cpp +++ b/src/particle/rotationalparticle.cpp @@ -24,6 +24,8 @@ #include "simpleanimation.h" +#include "utils/delete2.h" + #include <cmath> #include "debug.h" @@ -46,8 +48,7 @@ RotationalParticle::RotationalParticle(const XmlNodePtr animationNode, RotationalParticle::~RotationalParticle() { - delete mAnimation; - mAnimation = nullptr; + delete2(mAnimation); mImage = nullptr; } |