From c4a6dd36733fc3365d5a8913e8cdc7b4c1175c8d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 16 Mar 2016 21:21:32 +0300
Subject: Move image field from ImageParticle into Particle.

---
 src/particle/particle.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/particle/particle.cpp')

diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 0805aed8c..db25f3c77 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -32,6 +32,7 @@
 #include "particle/rotationalparticle.h"
 #include "particle/textparticle.h"
 
+#include "resources/image.h"
 #include "resources/resourcemanager.h"
 
 #include "resources/animation/simpleanimation.h"
@@ -60,6 +61,7 @@ Particle::Particle() :
     mAlive(AliveStatus::ALIVE),
     mType(ParticleType::Normal),
     mAnimation(nullptr),
+    mImage(nullptr),
     mChildEmitters(),
     mChildParticles(),
     mDeathEffect(),
@@ -83,6 +85,22 @@ Particle::~Particle()
     // Delete child emitters and child particles
     clear();
     delete2(mAnimation);
+    if (mImage)
+    {
+        const std::string &restrict name = mImage->getIdPath();
+        StringIntMapIter it
+            = ImageParticle::imageParticleCountByName.find(name);
+        if (it != ImageParticle::imageParticleCountByName.end())
+        {
+            int &cnt = (*it).second;
+            if (cnt > 0)
+                cnt --;
+        }
+
+        mImage->decRef();
+        mImage = nullptr;
+    }
+
     ParticleEngine::particleCount--;
 }
 
-- 
cgit v1.2.3-70-g09d2