From 43b1f896f42f986c6c19daaa3f3f78e6215e0953 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 27 Mar 2012 22:36:02 +0200
Subject: [PATCH] fix object pickup when player is very close to object

---
 apps/openmw/mwworld/physicssystem.cpp |  9 ++-------
 apps/openmw/mwworld/world.cpp         | 11 +++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 1d8f14cc42..83c3ef2bab 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -57,8 +57,6 @@ namespace MWWorld
         Ray centerRay = mRender.getCamera()->getCameraToViewportRay(
         mRender.getViewport()->getWidth()/2,
         mRender.getViewport()->getHeight()/2);
-        //let's avoid the capsule shape of the player.
-        centerRay.setOrigin(centerRay.getOrigin() + 20*centerRay.getDirection());
         btVector3 from(centerRay.getOrigin().x,-centerRay.getOrigin().z,centerRay.getOrigin().y);
         btVector3 to(centerRay.getPoint(500).x,-centerRay.getPoint(500).z,centerRay.getPoint(500).y);
 
@@ -71,11 +69,8 @@ namespace MWWorld
         Ray centerRay = mRender.getCamera()->getCameraToViewportRay(
         mRender.getViewport()->getWidth()/2,
         mRender.getViewport()->getHeight()/2);
-        //let's avoid the capsule shape of the player.
-        centerRay.setOrigin(centerRay.getOrigin() + 20*centerRay.getDirection());
-        btVector3 from(centerRay.getOrigin().x,-centerRay.getOrigin().z,centerRay.getOrigin().y);
-        btVector3 to(centerRay.getPoint(500).x,-centerRay.getPoint(500).z,centerRay.getPoint(500).y);
-        return from * (1-extent) + to * extent;
+        btVector3 result(centerRay.getPoint(500*extent).x,-centerRay.getPoint(500*extent).z,centerRay.getPoint(500*extent).y);
+        return result;
     }
     
     bool PhysicsSystem::castRay(const Vector3& from, const Vector3& to)
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 567ed8f90b..dd30447338 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -749,6 +749,17 @@ namespace MWWorld
                 // figure out which object we want to test against
                 std::vector < std::pair < float, std::string > > results = mPhysics->getFacedObjects();
 
+                // ignore the player
+                for (std::vector < std::pair < float, std::string > >::iterator it = results.begin();
+                    it != results.end(); ++it)
+                {
+                    if ( (*it).second == mPlayer->getPlayer().getRefData().getHandle() )
+                    {
+                        results.erase(it);
+                        break;
+                    }
+                }
+
                 if (results.size() == 0)
                 {
                     mNumFacing = 0;