From bd0e9e7aa83f8fef35321832960dc127ddf5f1f0 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 2 Mar 2019 19:53:46 +0100 Subject: Core/MMaps: Fix infinite loop in Detour Fix another infinite loop in Detour caused by degenerated triangles. Check the result of some previously ignored Detour calls. Update recastnavigation to 3a619d773deb7e3a15ee215217c825995fe71312 and apply some more custom changes (cherry picked from commit c602220e02bed1ad76c9e60064eeec5fd97bfe80) --- src/server/game/Movement/PathGenerator.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp index c9dd1647268..7be391a5e80 100644 --- a/src/server/game/Movement/PathGenerator.cpp +++ b/src/server/game/Movement/PathGenerator.cpp @@ -818,10 +818,12 @@ dtStatus PathGenerator::FindSmoothPath(float const* startPos, float const* endPo dtPolyRef visited[MAX_VISIT_POLY]; uint32 nvisited = 0; - _navMeshQuery->moveAlongSurface(polys[0], iterPos, moveTgt, &_filter, result, visited, (int*)&nvisited, MAX_VISIT_POLY); + if (dtStatusFailed(_navMeshQuery->moveAlongSurface(polys[0], iterPos, moveTgt, &_filter, result, visited, (int*)&nvisited, MAX_VISIT_POLY))) + return DT_FAILURE; npolys = FixupCorridor(polys, npolys, MAX_PATH_LENGTH, visited, nvisited); - _navMeshQuery->getPolyHeight(polys[0], result, &result[1]); + if (dtStatusFailed(_navMeshQuery->getPolyHeight(polys[0], result, &result[1]))) + return DT_FAILURE; result[1] += 0.5f; dtVcopy(iterPos, result); @@ -866,7 +868,8 @@ dtStatus PathGenerator::FindSmoothPath(float const* startPos, float const* endPo } // Move position at the other side of the off-mesh link. dtVcopy(iterPos, connectionEndPos); - _navMeshQuery->getPolyHeight(polys[0], iterPos, &iterPos[1]); + if (dtStatusFailed(_navMeshQuery->getPolyHeight(polys[0], iterPos, &iterPos[1]))) + return DT_FAILURE; iterPos[1] += 0.5f; } } -- cgit v1.2.3