diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/base/commodity.cc | 3 | ||||
| -rw-r--r-- | src/game/base/ship.cc | 1 | ||||
| -rw-r--r-- | src/game/base/shipmodel.cc | 4 | ||||
| -rw-r--r-- | src/game/intro/convoy.cc | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/game/base/commodity.cc b/src/game/base/commodity.cc index d41d370..4f238be 100644 --- a/src/game/base/commodity.cc +++ b/src/game/base/commodity.cc @@ -16,9 +16,8 @@ namespace game core::InfoType *Commodity::commodity_infotype = 0; -Commodity::Commodity() : core::Info() +Commodity::Commodity() : core::Info(commodity_infotype) { - set_type(commodity_infotype); } Commodity::~Commodity() diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 7cdf2ca..f2bd703 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -30,6 +30,7 @@ Ship::Ship(core::Player *owner, ShipModel *shipmodel) : { set_modelname(shipmodel->modelname()); set_name(shipmodel->name()); + set_info(shipmodel); std::string str(aux::text_strip(owner->name())); aux::to_label(str); diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index 4f219eb..dacc5a6 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -16,10 +16,8 @@ namespace game core::InfoType *ShipModel::shipmodel_infotype = 0; -ShipModel::ShipModel() +ShipModel::ShipModel() : core::Info(shipmodel_infotype) { - set_type(shipmodel_infotype); - //default specifications shipmodel_acceleration = 1.0f; // thruster acceleration in game untits/second^2 shipmodel_maxspeed = 3.0f; // maximum thruster speed in game units/second diff --git a/src/game/intro/convoy.cc b/src/game/intro/convoy.cc index 4a21071..413e377 100644 --- a/src/game/intro/convoy.cc +++ b/src/game/intro/convoy.cc @@ -14,8 +14,8 @@ namespace intro Member::Member(std::string const &model) : core::EntityControlable(0, 1) { - set_name("Convoy member"); - set_label(model); + set_name("Convoy ship"); + set_label("ship"); set_modelname(model); |