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/physics.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/physics.cc')
| -rw-r--r-- | src/core/physics.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/physics.cc b/src/core/physics.cc index 6969b06..5504c50 100644 --- a/src/core/physics.cc +++ b/src/core/physics.cc @@ -8,6 +8,8 @@ #include "core/physics.h" #include "core/zone.h" +#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h" + namespace core { btDefaultCollisionConfiguration *Physics::physics_configuration = 0; @@ -23,6 +25,7 @@ void Physics::init() physics_configuration = new btDefaultCollisionConfiguration(); physics_dispatcher = new btCollisionDispatcher(physics_configuration); + btGImpactCollisionAlgorithm::registerAlgorithm(physics_dispatcher); physics_solver = new btSequentialImpulseConstraintSolver; physics_timestamp = 0; |