Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-03-07 13:57:09 +0000
committerStijn Buys <ingar@osirion.org>2009-03-07 13:57:09 +0000
commit4c53365c16362156529c7669079e31845384589f (patch)
tree193bb5d05299d2acb38311d108c1d39b6e1dd229 /src/game/base/jumppoint.cc
parentee2200638be3fcb14097f3e8b0abb93e210f93d9 (diff)
renamed Entity::eventstate() to Entity::state(),
introduced Destroyed state
Diffstat (limited to 'src/game/base/jumppoint.cc')
-rw-r--r--src/game/base/jumppoint.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/base/jumppoint.cc b/src/game/base/jumppoint.cc
index eb51b68..e489055 100644
--- a/src/game/base/jumppoint.cc
+++ b/src/game/base/jumppoint.cc
@@ -81,7 +81,7 @@ JumpGate::JumpGate() : JumpPoint()
entity_radius = 1.0f;
entity_moduletypeid = jumpgate_enttype;
- entity_eventstate = core::Entity::NoPower;
+ entity_state = core::Entity::NoPower;
}
JumpGate::~JumpGate()
@@ -138,7 +138,7 @@ void JumpGate::dock(core::Entity *entity)
void JumpGate::activate()
{
jumpgate_timer = 10.0f;
- entity_eventstate = core::Entity::Normal;
+ set_state(core::Entity::Normal);
}
void JumpGate::frame(float elapsed)
@@ -147,7 +147,7 @@ void JumpGate::frame(float elapsed)
jumpgate_timer -= elapsed;
if (jumpgate_timer < 0) {
- entity_eventstate = core::Entity::NoPower;
+ set_state(core::Entity::NoPower);
jumpgate_timer = 0;
}
}