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/shipmodel.cc')
-rw-r--r--src/game/base/shipmodel.cc11
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");
}
}