From f93135b20f32675df5868dc1bacbfa86bcca6176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gero=20M=C3=BCller?= <gero.mueller@physik.rwth-aachen.de>
Date: Thu, 27 Jan 2011 22:24:14 +0100
Subject: [PATCH] fixed bullet destroy order

---
 src/common/Game.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/common/Game.h b/src/common/Game.h
index fb4e79d..3905462 100644
--- a/src/common/Game.h
+++ b/src/common/Game.h
@@ -104,11 +104,6 @@ private:
 	void loadLevelShape();
 	void loadShipShape();
 
-	const std::auto_ptr<btDefaultCollisionConfiguration> collisionConfiguration;
-	const std::auto_ptr<btCollisionDispatcher> dispatcher;
-	const std::auto_ptr<btBroadphaseInterface> overlappingPairCache;
-	const std::auto_ptr<btSequentialImpulseConstraintSolver> solver;
-	const std::auto_ptr<btDiscreteDynamicsWorld> dynamicsWorld;
 	std::auto_ptr<btTriangleIndexVertexArray> levelVertexArray;
 	std::auto_ptr<btCollisionShape> levelShape;
 	std::auto_ptr<btMotionState> levelState;
@@ -117,6 +112,12 @@ private:
 	std::auto_ptr<btTriangleIndexVertexArray> shipVertexArray;
 	std::auto_ptr<btCollisionShape> shipShape;
 
+	const std::auto_ptr<btDefaultCollisionConfiguration> collisionConfiguration;
+	const std::auto_ptr<btCollisionDispatcher> dispatcher;
+	const std::auto_ptr<btBroadphaseInterface> overlappingPairCache;
+	const std::auto_ptr<btSequentialImpulseConstraintSolver> solver;
+	const std::auto_ptr<btDiscreteDynamicsWorld> dynamicsWorld;
+
 	Schedule slaveUpdate;
 };