Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-11-12 19:50:04 +0000
committerStijn Buys <ingar@osirion.org>2010-11-12 19:50:04 +0000
commite6516fb9999ae47a828e032f0908d2f2ae4b2434 (patch)
tree80aaed66e95541d93bd56de6fb8cad997e078856 /src/game/base/shipmodel.cc
parentb460b3193e54b7364bb75ff26ce6f999887e454b (diff)
enables entity model scaling, Entity::radius() gets precedence over Model::radius(),
corrected bullet motionstate transfer bug in Entity::reset(), minor cleanups
Diffstat (limited to 'src/game/base/shipmodel.cc')
-rw-r--r--src/game/base/shipmodel.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index 1cea640..4c67e72 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -153,7 +153,9 @@ void ShipModel::done()
ShipModel::ShipModel() : core::Info(shipmodel_infotype)
{
shipmodel_maxspeed = 0;
+
//default specifications
+ shipmodel_radius = 0;
shipmodel_mass = 10.0f;
shipmodel_thrust_force = 0.8f;
shipmodel_impulse_force = 4.0f;
@@ -165,6 +167,8 @@ ShipModel::ShipModel() : core::Info(shipmodel_infotype)
shipmodel_jumpdrive = false; // no jumpdrive capability
shipmodel_dockable = false; // not dockable
+ shipmodel_template = 0;
+
}
ShipModel::~ShipModel()