diff options
| author | Stijn Buys <ingar@osirion.org> | 2011-07-12 14:26:09 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2011-07-12 14:26:09 +0000 |
| commit | 8c3abbb3c04c6119b8f0ceb546c3aff66703ba14 (patch) | |
| tree | 975ff9f73ef7841763111a0e0dc7065e34e3cbf7 /src/game/base/shipmodel.cc | |
| parent | bbbd41ccf4e7501e93689afecab442cb7e60a5de (diff) | |
Removed Entity::Complex flag: collision models will be used if availble,
removed a number of irrelevant comments.
Diffstat (limited to 'src/game/base/shipmodel.cc')
| -rw-r--r-- | src/game/base/shipmodel.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index 85efcc1..ec3259d 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -92,9 +92,6 @@ 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; @@ -215,7 +212,6 @@ ShipModel::ShipModel() : core::Info(shipmodel_infotype) shipmodel_jumpdrive = false; // no jumpdrive capability shipmodel_dockable = false; // not dockable shipmodel_template = 0; - shipmodel_complex_collision = false; } @@ -378,9 +374,6 @@ 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 |