summaryrefslogtreecommitdiff
path: root/src/particle.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-10-23 08:02:22 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-10-23 08:02:22 +0000
commit8eda6c18fd391e34f180aaece96140a374f274f9 (patch)
tree9598ebf5280790951b30befe9c84d4bba57198e4 /src/particle.cpp
parentc9f618b5c50f759cf172d8e37063ef56e05812cf (diff)
downloadmana-8eda6c18fd391e34f180aaece96140a374f274f9.tar.gz
mana-8eda6c18fd391e34f180aaece96140a374f274f9.tar.bz2
mana-8eda6c18fd391e34f180aaece96140a374f274f9.tar.xz
mana-8eda6c18fd391e34f180aaece96140a374f274f9.zip
Merged changesets 3653, 3655-3657, 3659-3560, 3671-3672 from trunk to
0.0. Mostly memory leak fixes by Guillaume.
Diffstat (limited to 'src/particle.cpp')
-rw-r--r--src/particle.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/particle.cpp b/src/particle.cpp
index cdd6af41..0f116b15 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -240,6 +240,7 @@ Particle::addEffect(const std::string &particleEffectFile,
{
logger->log("Warning: %s is not a valid particle effect definition file!",
particleEffectFile.c_str());
+ xmlFreeDoc(doc);
return NULL;
}
@@ -299,6 +300,8 @@ Particle::addEffect(const std::string &particleEffectFile,
mChildParticles.push_back(newParticle);
}
+ xmlFreeDoc(doc);
+
return newParticle;
}