server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix findPath to return DT_OUT_OF_NODES correctly (#222)

Browse Source 
findPath was unconditionally overriding the status it used to indicate
DT_OUT_OF_NODES for later. Restore this behavior so it properly can
return this failure flag.

Fix #221
This commit is contained in:
Jakob Botsch Nielsen 2016-07-27 20:40:42 +02:00 committed by GitHub
parent 9052db45d8
commit 64385e9ed0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Detour/Source/DetourNavMeshQuery.cpp
View File

@ -1052,7 +1052,7 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
dtNode* lastBestNode = startNode; dtNode* lastBestNode = startNode;
float lastBestNodeCost = startNode->total; float lastBestNodeCost = startNode->total;
dtStatus status = DT_SUCCESS; bool outOfNodes = false;
while (!m_openList->empty()) while (!m_openList->empty())
{ {
@ -1110,7 +1110,7 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
dtNode* neighbourNode = m_nodePool->getNode(neighbourRef, crossSide); dtNode* neighbourNode = m_nodePool->getNode(neighbourRef, crossSide);
if (!neighbourNode) if (!neighbourNode)
{ {
status |= DT_OUT_OF_NODES; outOfNodes = true;
continue; continue;
} }
@ -1190,10 +1190,13 @@ dtStatus dtNavMeshQuery::findPath(dtPolyRef startRef, dtPolyRef endRef,
} }
} }
status = getPathToNode(lastBestNode, path, pathCount, maxPath); dtStatus status = getPathToNode(lastBestNode, path, pathCount, maxPath);
if (lastBestNode->id != endRef) if (lastBestNode->id != endRef)
status |= DT_PARTIAL_RESULT; status |= DT_PARTIAL_RESULT;
if (outOfNodes)
status |= DT_OUT_OF_NODES;
return status; return status;
} }