diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-13 19:58:50 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-13 19:58:50 +0000 |
| commit | b68389e450d537eed51683515d1c4d6f7450caf2 (patch) | |
| tree | de85be0624341e6daf2fa7770d83ef7335faff0f | |
| parent | c11d6ab431af85e14790ef2c2ed52cb5b523fbaf (diff) | |
don't set shipmodel info on world entities as this would make shipmodel info editable
through zone.ini
| -rw-r--r-- | src/game/base/ship.cc | 1 | ||||
| -rw-r--r-- | src/game/base/shipmodel.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index b8dc6d0..65bab4b 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -32,6 +32,7 @@ Ship::Ship(core::Player *owner, const ShipModel *shipmodel) : core::EntityContro set_radius(0); ship_shipmodel = shipmodel; + ship_impulsedrive_timer = 0; ship_jumpdrive_timer = 0; ship_jumpdepart = 0; diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index dcea80c..4d7af18 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -357,8 +357,6 @@ void ShipModel::apply(core::Entity *entity) const if (radius()) entity->set_radius(radius()); - - entity->set_info(this); } void ShipModel::apply(Ship *ship) const @@ -366,6 +364,8 @@ void ShipModel::apply(Ship *ship) const // apply ship model settings apply (static_cast<core::Entity *>(ship)); + ship->set_info(this); + ship->set_mass(mass()); ship->set_impulse_force(impulse_force()); ship->set_thrust_force(thrust_force()); |