Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-11-16 13:53:44 +0000
committerStijn Buys <ingar@osirion.org>2008-11-16 13:53:44 +0000
commit315a8c2dff9b76ac5e1ebbef265f13ac19d65e3d (patch)
treedec6de0bcf7f19dd95b7121f27b185da67cee4e2 /src/game
parent28ba97bdd8fb6ca352dc49dba01a66bd155ad523 (diff)
engine trails
Diffstat (limited to 'src/game')
-rw-r--r--src/game/base/ship.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 214d234..5473581 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -60,7 +60,12 @@ void Ship::reset()
}
void Ship::func_impulse()
{
- if ((entity_eventstate == core::Entity::Impulse) || (entity_eventstate == core::Entity::ImpulseInitiate)) {
+ if (entity_eventstate == core::Entity::Impulse) {
+ entity_eventstate = core::Entity::Normal;
+ target_thrust = 1.0f;
+ entity_thrust = 1.0f;
+
+ } else if (entity_eventstate == core::Entity::ImpulseInitiate) {
entity_eventstate = core::Entity::Normal;
} else if (entity_eventstate != core::Entity::Normal) {