Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/draw.cc')
-rw-r--r--src/render/draw.cc10
1 files changed, 5 insertions, 5 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();