diff options
author | Stijn Buys <ingar@osirion.org> | 2013-10-13 20:14:17 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2013-10-13 20:14:17 +0000 |
commit | d6471bf0f398257cb379944323cf85e8115491a5 (patch) | |
tree | a65de7dfe769d12fc88bb56f16bffc7f330e1d08 /src/render/particlesystem.cc | |
parent | d192894dc60562c04a98ea0ba361045178e096d7 (diff) |
Axded explosion trigger for particle ejecotrs, fixed explosion particles for destroyed entities.
Diffstat (limited to 'src/render/particlesystem.cc')
-rw-r--r-- | src/render/particlesystem.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/render/particlesystem.cc b/src/render/particlesystem.cc index 7cf8f2f..1e3f13b 100644 --- a/src/render/particlesystem.cc +++ b/src/render/particlesystem.cc @@ -158,7 +158,7 @@ void ParticleSystem::draw(const float seconds) if (entity()) { bool ejector_active = true; - if (ejector->impulse() || ejector->thrust()) { + if (ejector->impulse() || ejector->thrust() || ejector->explosion()) { ejector_active = false; } @@ -182,7 +182,10 @@ void ParticleSystem::draw(const float seconds) break; default: - ejector_active = false; + // ejectors should be active to draw explosions + if (ejector->explosion()) { + ejector_active = true; + } break; } |