From 9fce428929cce5b0f1be761683ec3d937f0ef00b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 18 Nov 2015 20:41:49 +0100
Subject: [PATCH] ContactTestResultCallback: do not rely on col1 being the
 object tested against

Unsure why, but in some cases col0 and col1 are swapped.
---
 apps/openmw/mwphysics/physicssystem.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 1393832bb..5d8fa2da2 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -936,6 +936,13 @@ namespace MWPhysics
     class ContactTestResultCallback : public btCollisionWorld::ContactResultCallback
     {
     public:
+        ContactTestResultCallback(const btCollisionObject* testedAgainst)
+            : mTestedAgainst(testedAgainst)
+        {
+        }
+
+        const btCollisionObject* mTestedAgainst;
+
         std::vector<MWWorld::Ptr> mResult;
 
 #if BT_BULLET_VERSION >= 281
@@ -944,11 +951,15 @@ namespace MWPhysics
                                          const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
         {
             const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
+            if (collisionObject == mTestedAgainst)
+                collisionObject = col1Wrap->m_collisionObject;
 #else
         virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
                                          const btCollisionObject* col1, int partId1, int index1)
         {
             const btCollisionObject* collisionObject = col0;
+            if (collisionObject == mTestedAgainst)
+                collisionObject = col1;
 #endif
             const PtrHolder* holder = static_cast<const PtrHolder*>(collisionObject->getUserPointer());
             if (holder)
@@ -967,7 +978,7 @@ namespace MWPhysics
         else
             return std::vector<MWWorld::Ptr>();
 
-        ContactTestResultCallback resultCallback;
+        ContactTestResultCallback resultCallback (me);
         resultCallback.m_collisionFilterGroup = collisionGroup;
         resultCallback.m_collisionFilterMask = collisionMask;
         mCollisionWorld->contactTest(me, resultCallback);