diff options
author | Stijn Buys <ingar@osirion.org> | 2010-11-12 19:50:04 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-11-12 19:50:04 +0000 |
commit | e6516fb9999ae47a828e032f0908d2f2ae4b2434 (patch) | |
tree | 80aaed66e95541d93bd56de6fb8cad997e078856 /src/game/base/cargopod.cc | |
parent | b460b3193e54b7364bb75ff26ce6f999887e454b (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/cargopod.cc')
-rw-r--r-- | src/game/base/cargopod.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/game/base/cargopod.cc b/src/game/base/cargopod.cc index ed3ea69..09e5183 100644 --- a/src/game/base/cargopod.cc +++ b/src/game/base/cargopod.cc @@ -20,10 +20,21 @@ CargoPod::CargoPod() : EntityDynamic() set_flag(core::Entity::KeepAlive); + set_radius(0); + // use template settings if available if (cargopod_template) { cargopod_template->apply(this); } + + // radius fallback + if (!radius()) { + if (model()->radius()) { + set_radius(model()->radius()); + } else { + set_radius(0.1f); + } + } // activate physics set_mass(radius()); |