diff options
| author | Stijn Buys <ingar@osirion.org> | 2011-02-04 13:23:05 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2011-02-04 13:23:05 +0000 |
| commit | a69521970793424754421c8a5fba2eb465e817e6 (patch) | |
| tree | f44f178a27f621f0f11ed5959418d83ee399ffcd /src/core/entity.cc | |
| parent | 7129e31075e021112ba6a859af29513e69671626 (diff) | |
Made time(), timestamp() and related methods non-virtual, corrects a crash when
the dedicated server quits.
Diffstat (limited to 'src/core/entity.cc')
| -rw-r--r-- | src/core/entity.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index cf005a0..c7b3efe 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -513,12 +513,17 @@ void Entity::reset() // use collision mesh btBvhTriangleMeshShape *meshshape = new btBvhTriangleMeshShape(model()->collisionmesh()->triangles(), true, true); meshshape->buildOptimizedBvh(); - meshshape->recalcLocalAabb(); + meshshape->recalcLocalAabb(); + + //btGImpactMeshShape *meshshape = new btGImpactMeshShape(model()->collisionmesh()->triangles()); btVector3 modelscalevec(modelscale, modelscale, modelscale); meshshape->setLocalScaling(modelscalevec); + meshshape->setMargin(0.0f); + //meshshape->updateBound(); entity_collision_shape = meshshape; + // con_debug << " " << label() << " attached collision mesh: " << model()->collisionmesh()->size() << " triangles" << std::endl; } else { // use bounding box |