diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-12 16:24:17 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-12 16:24:17 +0000 |
| commit | b460b3193e54b7364bb75ff26ce6f999887e454b (patch) | |
| tree | d35e4972fd3ee54b9922908e3791a53bae96af14 /src/game/base/shipmodel.cc | |
| parent | c0c2a0ccc335b00983bf69b99b7a44505ed24b47 (diff) | |
moved global entity info type to core::Entity::infotype(),
automatic generation of jumppoint and jumpgate names and descriptions,
prepared game code for the seperation of Entity::radius() and Model::radius()
Diffstat (limited to 'src/game/base/shipmodel.cc')
| -rw-r--r-- | src/game/base/shipmodel.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index 4cf55bf..1cea640 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -73,7 +73,7 @@ bool ShipModel::init() shipmodel->set_jumpdrive(b); continue; } else if (inifile.got_key_bool("dock", b)) { - shipmodel->set_dock(b); + shipmodel->set_dockable(b); continue; } else if (inifile.got_key_float("maxspeed", f)) { shipmodel->set_maxspeed(f * 0.01f); @@ -145,6 +145,11 @@ bool ShipModel::init() return true; } +void ShipModel::done() +{ + core::Func::remove("list_ship"); +} + ShipModel::ShipModel() : core::Info(shipmodel_infotype) { shipmodel_maxspeed = 0; @@ -159,7 +164,7 @@ ShipModel::ShipModel() : core::Info(shipmodel_infotype) shipmodel_maxcargo = 0.0f; shipmodel_jumpdrive = false; // no jumpdrive capability - shipmodel_dock = false; // not dockable + shipmodel_dockable = false; // not dockable } ShipModel::~ShipModel() @@ -195,7 +200,7 @@ void ShipModel::generate_info() add_text("^Bhyperspace jump drive"); } - if (dock()) { + if (dockable()) { add_text("^Bdockable"); } } |