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

Remove dead assignments to status value in findStraightPath

Browse Source 
Add comments explaining why the return values are ignored
Clarify the status return value logic in appendVertex
This commit is contained in:
Ben Hymers 2016-03-13 12:19:38 +00:00
parent 8f16b7de2f
commit 2f382134d4
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Detour/Source/DetourNavMeshQuery.cpp
View File

@ -1721,10 +1721,17 @@ dtStatus dtNavMeshQuery::appendVertex(const float* pos, const unsigned char flag
if (straightPathRefs) if (straightPathRefs)
straightPathRefs[(*straightPathCount)] = ref; straightPathRefs[(*straightPathCount)] = ref;
(*straightPathCount)++; (*straightPathCount)++;
// If reached end of path or there is no space to append more vertices, return.
if (flags == DT_STRAIGHTPATH_END || (*straightPathCount) >= maxStraightPath) // If there is no space to append more vertices, return.
if ((*straightPathCount) >= maxStraightPath)
{ {
return DT_SUCCESS | (((*straightPathCount) >= maxStraightPath) ? DT_BUFFER_TOO_SMALL : 0); return DT_SUCCESS | DT_BUFFER_TOO_SMALL;
}
// If reached end of path, return.
if (flags == DT_STRAIGHTPATH_END)
{
return DT_SUCCESS;
} }
} }
return DT_IN_PROGRESS; return DT_IN_PROGRESS;
@ -1870,12 +1877,14 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
// Apeend portals along the current straight path segment. // Apeend portals along the current straight path segment.
if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS)) if (options & (DT_STRAIGHTPATH_AREA_CROSSINGS | DT_STRAIGHTPATH_ALL_CROSSINGS))
{ {
stat = appendPortals(apexIndex, i, closestEndPos, path, // Ignore status return value as we're just about to return anyway.
appendPortals(apexIndex, i, closestEndPos, path,
straightPath, straightPathFlags, straightPathRefs, straightPath, straightPathFlags, straightPathRefs,
straightPathCount, maxStraightPath, options); straightPathCount, maxStraightPath, options);
} }
stat = appendVertex(closestEndPos, 0, path[i], // Ignore status return value as we're just about to return anyway.
appendVertex(closestEndPos, 0, path[i],
straightPath, straightPathFlags, straightPathRefs, straightPath, straightPathFlags, straightPathRefs,
straightPathCount, maxStraightPath); straightPathCount, maxStraightPath);
@ -2013,7 +2022,8 @@ dtStatus dtNavMeshQuery::findStraightPath(const float* startPos, const float* en
} }
} }
stat = appendVertex(closestEndPos, DT_STRAIGHTPATH_END, 0, // Ignore status return value as we're just about to return anyway.
appendVertex(closestEndPos, DT_STRAIGHTPATH_END, 0,
straightPath, straightPathFlags, straightPathRefs, straightPath, straightPathFlags, straightPathRefs,
straightPathCount, maxStraightPath); straightPathCount, maxStraightPath);