diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-03-07 13:57:09 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-03-07 13:57:09 +0000 |
| commit | 4c53365c16362156529c7669079e31845384589f (patch) | |
| tree | 193bb5d05299d2acb38311d108c1d39b6e1dd229 /src/render/particles.cc | |
| parent | ee2200638be3fcb14097f3e8b0abb93e210f93d9 (diff) | |
renamed Entity::eventstate() to Entity::state(),
introduced Destroyed state
Diffstat (limited to 'src/render/particles.cc')
| -rw-r--r-- | src/render/particles.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/particles.cc b/src/render/particles.cc index ef6886a..13b69a4 100644 --- a/src/render/particles.cc +++ b/src/render/particles.cc @@ -229,7 +229,7 @@ void ParticleSystem::draw(float elapsed) { if (particlesystem_entity->type() == core::Entity::Controlable) { core::EntityControlable *ec = static_cast<core::EntityControlable *>(particlesystem_entity); - if (ec->eventstate() == core::Entity::Docked) { + if (ec->state() == core::Entity::Docked) { if (particlesystem_stream.size()) clear(); return; @@ -263,7 +263,7 @@ void ParticleSystem::draw(float elapsed) } } else if (particlesystem_entity->type() == core::Entity::Controlable) { core::EntityControlable *ec = static_cast<core::EntityControlable *>(particlesystem_entity); - if ((ec->thrust() > 0.0f) || (ec->eventstate() == core::Entity::ImpulseInitiate) || (ec->eventstate() == core::Entity::Impulse)) { + if ((ec->thrust() > 0.0f) || (ec->state() == core::Entity::ImpulseInitiate) || (ec->state() == core::Entity::Impulse)) { ejector_active = true; } } |