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.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index 126557c..ec712ac 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -92,6 +92,9 @@ bool ShipModel::init()
} else if (inifile.got_key_bool("dock", b)) {
shipmodel->set_dockable(b);
continue;
+ } else if (inifile.got_key_bool("complex", b)) {
+ shipmodel->set_complex_collision(b);
+ continue;
} else if (inifile.got_key_float("maxspeed", f)) {
shipmodel->set_maxspeed(f * 0.01f);
continue;
@@ -212,6 +215,7 @@ ShipModel::ShipModel() : core::Info(shipmodel_infotype)
shipmodel_jumpdrive = false; // no jumpdrive capability
shipmodel_dockable = false; // not dockable
shipmodel_template = 0;
+ shipmodel_complex_collision = false;
}
@@ -374,6 +378,9 @@ void ShipModel::apply(core::Entity *entity) const
if (radius())
entity->set_radius(radius());
+
+ if (complex_collision())
+ entity->set_flag(core::Entity::Complex);
}
void ShipModel::apply(Ship *ship) const