diff options
author | Stijn Buys <ingar@osirion.org> | 2008-11-01 13:33:18 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-11-01 13:33:18 +0000 |
commit | 83d6c17799c4d448a67ab5cdad02954282fa5c94 (patch) | |
tree | 2d76abb9bb501491f78e07822ed52e8302fdd247 /src/game/base/ship.cc | |
parent | a6bceed80f1b4315f23656efeceb6fe02cc7641c (diff) |
server-side model loading, initial @dock function
Diffstat (limited to 'src/game/base/ship.cc')
-rw-r--r-- | src/game/base/ship.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 574d66c..412668d 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -26,9 +26,9 @@ const float MIN_DELTA = 0.000001f; Ship::Ship(core::Player *owner, ShipModel *shipmodel) : core::EntityControlable(owner, ship_enttype) { - entity_modelname = "ships/" + shipmodel->modelname(); - entity_name = shipmodel->name() + ": <^B" + owner->name() + "^N>"; - entity_label = shipmodel->label(); + set_modelname("ships/" + shipmodel->modelname()); + set_name(shipmodel->name() + ": <^B" + owner->name() + "^N>"); + set_label(shipmodel->label()); entity_moduletypeid = ship_enttype; @@ -266,6 +266,7 @@ void Ship::frame(float seconds) entity_dirty = true; // FIXME 5 second cooldown + entity_speed = Base::g_impulsespeed->value(); entity_eventstate = core::Entity::Normal; } else if (entity_eventstate == core::Entity::ImpulseInitiate) { |