From 9cf53410cf6500cb087fc9686a86f1e9cadbec7a Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 11 May 2014 22:59:28 +0400
Subject: [PATCH 2/3] fix srcs for new bullet API

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 src/physics/btKartRaycast.cpp | 4 ++--
 src/physics/physics.cpp       | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/physics/btKartRaycast.cpp b/src/physics/btKartRaycast.cpp
index 13b310f..7c00d42 100644
--- a/src/physics/btKartRaycast.cpp
+++ b/src/physics/btKartRaycast.cpp
@@ -63,7 +63,7 @@ void* btKartRaycaster::castRay(const btVector3& from, const btVector3& to,
 
     if (rayCallback.hasHit())
     {
-        btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject);
+        const btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject);
         if (body && body->hasContactResponse())
         {
             result.m_hitPointInWorld = rayCallback.m_hitPointWorld;
@@ -88,7 +88,7 @@ void* btKartRaycaster::castRay(const btVector3& from, const btVector3& to,
                     result.m_hitNormalInWorld.getZ());
 #endif
             }
-            return body;
+            return (void *) body;
         }
     }
     return 0;
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index fcff1f0..2d800cd 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -438,7 +438,6 @@ btScalar Physics::solveGroup(btCollisionObject** bodies, int numBodies,
                                                         constraints,
                                                         numConstraints, info,
                                                         debugDrawer,
-                                                        stackAlloc,
                                                         dispatcher);
     int currentNumManifolds = m_dispatcher->getNumManifolds();
     // We can't explode a rocket in a loop, since a rocket might collide with
@@ -450,10 +449,8 @@ btScalar Physics::solveGroup(btCollisionObject** bodies, int numBodies,
         btPersistentManifold* contact_manifold =
             m_dynamics_world->getDispatcher()->getManifoldByIndexInternal(i);
 
-        btCollisionObject* objA =
-            static_cast<btCollisionObject*>(contact_manifold->getBody0());
-        btCollisionObject* objB =
-            static_cast<btCollisionObject*>(contact_manifold->getBody1());
+        const btCollisionObject* objA = contact_manifold->getBody0();
+        const btCollisionObject* objB = contact_manifold->getBody1();
 
         unsigned int num_contacts = contact_manifold->getNumContacts();
         if(!num_contacts) continue;   // no real collision
-- 
1.9.0