From 2e1dda9010f8434a8ab91913eeea218338be58d1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 28 Apr 2013 16:19:40 +0200
Subject: [PATCH] Fix old bullet versions

---
 libs/openengine/bullet/physic.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index b41da093d0..dbb42a6456 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -513,7 +513,11 @@ namespace Physic
     {
     public:
         std::vector<std::string> mResult;
-        virtual	btScalar	addSingleResult(btManifoldPoint& cp,
+
+        // added in bullet 2.81
+        // this is just a quick hack, as there does not seem to be a BULLET_VERSION macro?
+#if defined(BT_COLLISION_OBJECT_WRAPPER_H)
+        virtual	btScalar addSingleResult(btManifoldPoint& cp,
                                             const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,
                                             const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1)
         {
@@ -522,8 +526,8 @@ namespace Physic
                 mResult.push_back(body->mName);
             return 0.f;
         }
-
-        virtual btScalar addSingleResult(btManifoldPoint&, const btCollisionObject* col0, int partId0, int index0,
+#else
+        virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
                                          const btCollisionObject* col1, int partId1, int index1)
         {
             const RigidBody* body = dynamic_cast<const RigidBody*>(col0);
@@ -531,6 +535,7 @@ namespace Physic
                 mResult.push_back(body->mName);
             return 0.f;
         }
+#endif
     };
 
     std::vector<std::string> PhysicEngine::getCollisions(const std::string& name)