diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-08 14:34:44 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-08 14:34:44 +0000 |
| commit | b7dc0938eb7d59f928bbcf2a3a4877a6f60940e5 (patch) | |
| tree | 5b4b4353f2012fced4180072e0b0def8ba8d22db /src/core/entity.cc | |
| parent | b685a594ae43aa30173912c9fb1177d507ec5a08 (diff) | |
moved clear() from game::Game~ to core::GameServer~ (solves FIXME),
unified bounding box code into math::BoundingBox3f class
Diffstat (limited to 'src/core/entity.cc')
| -rw-r--r-- | src/core/entity.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index 4f13efa..af100a9 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -512,7 +512,7 @@ void Entity::reset() if (!entity_body) { // create collision shape if (model()) { - entity_collision_shape = new btBoxShape(to_btVector3(model()->maxbbox())); + entity_collision_shape = new btBoxShape(to_btVector3(model()->box().max())); } else { entity_collision_shape = new btSphereShape(radius()); } @@ -938,7 +938,7 @@ void EntityControlable::reset() if (!entity_body) { // create collision shape if (model()) { - entity_collision_shape = new btBoxShape(to_btVector3(model()->maxbbox())); + entity_collision_shape = new btBoxShape(to_btVector3(model()->box().max())); } else { entity_collision_shape = new btSphereShape(radius()); } |