From 8c8986b2bc7a5dee3c12252486ad68a40a482ee0 Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Sat, 19 Jun 2010 17:26:12 +0200
Subject: Fix usage of uninitialized waypoint array variables in
 ConfusedMovementGenerator<T>::Initialize and revert 9b1c565510+ad8ce5245e
 that covered up this problem without fixing it and introduced a faulty LOS
 calculation. With thanks to Lynx3d and click, and Aokromes and ritchy for
 testing.

--HG--
branch : trunk
---
 src/server/collision/Maps/MapTree.cpp | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'src/server/collision/Maps/MapTree.cpp')

diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp
index c733ed37454..af4073fcc8c 100644
--- a/src/server/collision/Maps/MapTree.cpp
+++ b/src/server/collision/Maps/MapTree.cpp
@@ -146,32 +146,19 @@ namespace VMAP
 
     bool StaticMapTree::isInLineOfSight(const Vector3& pos1, const Vector3& pos2) const
     {
-        bool result = false;
+        bool result = true;
         float maxDist = (pos2 - pos1).magnitude();
         // valid map coords should *never ever* produce float overflow, but this would produce NaNs too
-
-        //ASSERT(maxDist < std::numeric_limits<float>::max());
-
+        ASSERT(maxDist < std::numeric_limits<float>::max());
         // prevent NaN values which can cause BIH intersection to enter infinite loop
         if (maxDist < 1e-10f)
             return true;
         // direction with length of 1
-	G3D::Plane checkPlane = G3D::Plane((pos2 - pos1)/maxDist,pos1, pos2);
         G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1)/maxDist);
-
-        Vector3 checkFinite = ray.intersection(checkPlane);
-        if (!checkFinite.isFinite())
+        float resultDist = getIntersectionTime(ray, maxDist, true);
+        if (resultDist < maxDist)
         {
-            ray = G3D::Ray::fromOriginAndDirection(pos1, -((pos2 - pos1)/maxDist));
-            checkFinite = ray.intersection(checkPlane);
-        }
-        if (checkFinite.isFinite())
-        {
-            float resultDist = getIntersectionTime(ray, maxDist, true);
-            if (resultDist >= maxDist)
-            {
-               result = true;
-            }
+            result = false;
         }
         return result;
     }
-- 
cgit v1.2.3