From 05cc258ed3fcd598ee90c608239b8f753262317d Mon Sep 17 00:00:00 2001
From: Assumeru <malusluminis@hotmail.com>
Date: Thu, 10 Nov 2016 15:38:14 +0100
Subject: [PATCH] Start trace from collision object origin

---
 apps/openmw/mwphysics/physicssystem.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index d854e0aca..21867591c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1328,10 +1328,12 @@ namespace MWPhysics
                     waterCollision = true;
                 else if (physicActor->getCollisionMode())
                 {
+                    const float halfZ = physicActor->getHalfExtents().z();
                     const osg::Vec3f actorPosition = physicActor->getPosition();
-                    const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + physicActor->getHalfExtents().z());
+                    const osg::Vec3f startingPosition(actorPosition.x(), actorPosition.y(), actorPosition.z() + halfZ);
+                    const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel + halfZ);
                     ActorTracer tracer;
-                    tracer.doTrace(physicActor->getCollisionObject(), actorPosition, destinationPosition, mCollisionWorld);
+                    tracer.doTrace(physicActor->getCollisionObject(), startingPosition, destinationPosition, mCollisionWorld);
                     if (tracer.mFraction >= 1.0f)
                     {
                         waterCollision = true;