From b9c6bbb51df0ed10f74617482740fedb91ff5366 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 7 Apr 2018 00:21:51 +0200 Subject: Core/Maps: Adjusted logic in GetFullTerrainStatusForPosition to closer match what the client does regarding being inside WMOs Closes #21625 Closes #21624 Closes #21516 --- src/common/Collision/Models/WorldModel.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/common/Collision/Models') diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp index 8f207c66aa2..8aa697781e2 100644 --- a/src/common/Collision/Models/WorldModel.cpp +++ b/src/common/Collision/Models/WorldModel.cpp @@ -371,9 +371,7 @@ namespace VMAP vertices(vert.begin()), triangles(tris.begin()), hit(false) { } bool operator()(G3D::Ray const& ray, uint32 entry, float& distance, bool /*pStopAtFirstHit*/) { - bool result = IntersectTriangle(triangles[entry], vertices, ray, distance); - if (result) - hit = true; + hit = IntersectTriangle(triangles[entry], vertices, ray, distance) || hit; return hit; } std::vector::const_iterator vertices; @@ -395,7 +393,6 @@ namespace VMAP { if (triangles.empty() || !iBound.contains(pos)) return false; - GModelRayCallback callback(triangles, vertices); Vector3 rPos = pos - 0.1f * down; float dist = G3D::finf(); G3D::Ray ray(rPos, down); -- cgit v1.2.3