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 | |
| parent | ee2200638be3fcb14097f3e8b0abb93e210f93d9 (diff) | |
renamed Entity::eventstate() to Entity::state(),
introduced Destroyed state
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/draw.cc | 10 | ||||
| -rw-r--r-- | src/render/particles.cc | 4 | ||||
| -rw-r--r-- | src/render/renderext.cc | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/render/draw.cc b/src/render/draw.cc index a435eff..a56e1dc 100644 --- a/src/render/draw.cc +++ b/src/render/draw.cc @@ -556,14 +556,14 @@ void draw_model_fragments(core::Entity *entity) if ((entity->type() == core::Entity::Dynamic) || (entity->type() == core::Entity::Controlable)) { - if (static_cast<core::EntityDynamic *>(entity)->eventstate() == core::Entity::NoPower) { + if (static_cast<core::EntityDynamic *>(entity)->state() == core::Entity::NoPower) { power = false; } else if (entity->type() == core::Entity::Controlable) { core::EntityControlable *ec = static_cast<core::EntityControlable *>(entity); - if ((ec->eventstate() == core::Entity::Impulse) || (ec->eventstate() == core::Entity::ImpulseInitiate)) { + if ((ec->state() == core::Entity::Impulse) || (ec->state() == core::Entity::ImpulseInitiate)) { thrust = 1.0f; } else { thrust = ec->thrust(); @@ -761,10 +761,10 @@ void draw_pass_model_fx(float elapsed) power = true; if ((entity->type() == core::Entity::Dynamic) && - (static_cast<core::EntityDynamic *>(entity)->eventstate() == core::Entity::NoPower)) { + (static_cast<core::EntityDynamic *>(entity)->state() == core::Entity::NoPower)) { power = false; } else if ((entity->type() == core::Entity::Controlable) && - (static_cast<core::EntityControlable *>(entity)->eventstate() == core::Entity::NoPower)) { + (static_cast<core::EntityControlable *>(entity)->state() == core::Entity::NoPower)) { power = false; } @@ -827,7 +827,7 @@ void draw_pass_model_fx(float elapsed) thrust = 1.0f; if (flare->engine() && ( entity->type() == core::Entity::Controlable)) { core::EntityControlable *ec = static_cast<core::EntityControlable *>(entity); - if ((ec->eventstate() == core::Entity::ImpulseInitiate) || (ec->eventstate() == core::Entity::Impulse)) { + if ((ec->state() == core::Entity::ImpulseInitiate) || (ec->state() == core::Entity::Impulse)) { thrust = 1.0f; } else { thrust = ec->thrust(); 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; } } diff --git a/src/render/renderext.cc b/src/render/renderext.cc index 1e82aa0..6a59870 100644 --- a/src/render/renderext.cc +++ b/src/render/renderext.cc @@ -105,7 +105,7 @@ void RenderExt::frame(float elapsed) state_detailvisible = false; if ((entity()->type() == core::Entity::Controlable)) { - if (static_cast<core::EntityDynamic *>(entity())->eventstate() == core::Entity::Docked) { + if (static_cast<core::EntityDynamic *>(entity())->state() == core::Entity::Docked) { state_visible = false; } } |