From e6516fb9999ae47a828e032f0908d2f2ae4b2434 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 12 Nov 2010 19:50:04 +0000 Subject: enables entity model scaling, Entity::radius() gets precedence over Model::radius(), corrected bullet motionstate transfer bug in Entity::reset(), minor cleanups --- src/game/base/cargopod.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/game/base/cargopod.cc') 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()); -- cgit v1.2.3