diff options
| author | Maarten Vanraes <maarten.vanraes@gmail.com> | 2011-05-26 22:22:10 +0200 |
|---|---|---|
| committer | Maarten Vanraes <maarten.vanraes@gmail.com> | 2011-05-26 22:22:10 +0200 |
| commit | 98b4c6c5b5eb7c60919108c130d534938aed853e (patch) | |
| tree | e79828f1c10311314402544414a81d55f6177b9c /src/particleemitter.cpp | |
| parent | 2115769d94e29479e404fdf08c553e755250dce1 (diff) | |
| parent | aeef06d5d58dcc6f9339bf6ef5a87e06a4827b17 (diff) | |
| download | plus-98b4c6c5b5eb7c60919108c130d534938aed853e.tar.gz plus-98b4c6c5b5eb7c60919108c130d534938aed853e.tar.bz2 plus-98b4c6c5b5eb7c60919108c130d534938aed853e.tar.xz plus-98b4c6c5b5eb7c60919108c130d534938aed853e.zip | |
Merge branch 'master' of git://gitorious.org/manaplus/manaplus
Diffstat (limited to 'src/particleemitter.cpp')
| -rw-r--r-- | src/particleemitter.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 33c2f1d92..5f107abb7 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -210,6 +210,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, logger->log1("Error: no valid imageset"); continue; } + mTempSets.push_back(imageset); // Get animation frames for_each_xml_child_node(frameNode, propertyNode) @@ -293,6 +294,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, logger->log1("Error: no valid imageset"); continue; } + mTempSets.push_back(imageset); // Get animation frames for_each_xml_child_node(frameNode, propertyNode) @@ -437,6 +439,14 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o) ParticleEmitter::~ParticleEmitter() { + for (std::list<ImageSet*>::iterator + i = mTempSets.begin(); + i != mTempSets.end(); ++i) + { + if (*i) + (*i)->decRef(); + } + if (mParticleImage) mParticleImage->decRef(); } |