summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-20 21:57:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-20 21:57:59 +0300
commiteffe771274674bb011e212b08616da8c9e01cfa0 (patch)
tree71a32ddbabad1887c15fe34275c6c1621398e094 /src/particle
parentd8d3cb7f29566cd47ad95c810da9ed87beac4817 (diff)
downloadmanaverse-effe771274674bb011e212b08616da8c9e01cfa0.tar.gz
manaverse-effe771274674bb011e212b08616da8c9e01cfa0.tar.bz2
manaverse-effe771274674bb011e212b08616da8c9e01cfa0.tar.xz
manaverse-effe771274674bb011e212b08616da8c9e01cfa0.zip
Remove wrong condition.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/particle.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 728433ae9..4d852a78d 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -240,14 +240,10 @@ bool Particle::update() restrict2
if (mLifetimeLeft == 0)
{
mAlive = AliveStatus::DEAD_TIMEOUT;
-
if (mChildParticles.empty())
{
- if (mAlive != AliveStatus::ALIVE &&
- mAutoDelete)
- {
+ if (mAutoDelete)
return false;
- }
return true;
}
}