From b08de2d689c845c740fd25294bf93adf226fdb97 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 16 Mar 2016 21:12:23 +0300 Subject: Move animation field from child particles classes into Particle. --- src/particle/particle.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/particle/particle.cpp') diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index 48edee676..0805aed8c 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -34,8 +34,11 @@ #include "resources/resourcemanager.h" +#include "resources/animation/simpleanimation.h" + #include "resources/dye/dye.h" +#include "utils/delete2.h" #include "utils/dtor.h" #include "utils/mathutils.h" @@ -56,6 +59,7 @@ Particle::Particle() : mVelocity(), mAlive(AliveStatus::ALIVE), mType(ParticleType::Normal), + mAnimation(nullptr), mChildEmitters(), mChildParticles(), mDeathEffect(), @@ -78,6 +82,7 @@ Particle::~Particle() { // Delete child emitters and child particles clear(); + delete2(mAnimation); ParticleEngine::particleCount--; } -- cgit v1.2.3-60-g2f50