From b460b3193e54b7364bb75ff26ce6f999887e454b Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 12 Nov 2010 16:24:17 +0000 Subject: 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() --- src/game/base/shipmodel.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/game/base/shipmodel.cc') 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"); } } -- cgit v1.2.3