Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/ship.cc')
-rw-r--r--src/game/base/ship.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 2c42ca8..7cdf2ca 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -41,7 +41,7 @@ Ship::Ship(core::Player *owner, ShipModel *shipmodel) :
get_color_second().assign(owner->color_second());
ship_shipmodel = shipmodel;
- ship_jumpdrive = shipmodel->shipmodel_jumpdrive;
+ ship_jumpdrive = shipmodel->jumpdrive();
ship_impulsedrive_timer = 0;
ship_jumpdrive_timer = 0;
@@ -68,7 +68,7 @@ void Ship::func_impulse()
if (entity_state == core::Entity::Impulse) {
entity_state = core::Entity::Normal;
target_thrust = 1.0f;
- entity_thrust = 1.0f;
+ entity_thrust = 0.0f;
} else if (entity_state == core::Entity::ImpulseInitiate) {
entity_state = core::Entity::Normal;