aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2019-03-02 19:53:46 +0100
committerjackpoz <giacomopoz@gmail.com>2019-03-02 19:53:46 +0100
commitc602220e02bed1ad76c9e60064eeec5fd97bfe80 (patch)
tree9a588f4eebd8f39bb0daa31356846fa6df505422 /src
parente9957b1765ceac9d8966ec50b0d64cb80e18d17a (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Movement/PathGenerator.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp
index d133fc2baf0..d9769181dfc 100644
--- a/src/server/game/Movement/PathGenerator.cpp
+++ b/src/server/game/Movement/PathGenerator.cpp
@@ -817,10 +817,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);
@@ -865,7 +867,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;
}
}