mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-29 05:41:37 +00:00
Merge branch 'fix_pathgrid_path' into 'master'
Use pathgrid path when destination is closer to different graph component node See merge request OpenMW/openmw!1155
This commit is contained in:
commit
4bf22f3ca0
1 changed files with 2 additions and 4 deletions
|
@ -206,9 +206,6 @@ namespace MWMechanics
|
|||
endPointInLocalCoords,
|
||||
startNode);
|
||||
|
||||
if (!endNode.second)
|
||||
return;
|
||||
|
||||
// if it's shorter for actor to travel from start to end, than to travel from either
|
||||
// start or end to nearest pathgrid point, just travel from start to end.
|
||||
float startToEndLength2 = (endPointInLocalCoords - startPointInLocalCoords).length2();
|
||||
|
@ -279,7 +276,8 @@ namespace MWMechanics
|
|||
// unreachable pathgrid point.
|
||||
//
|
||||
// The AI routines will have to deal with such situations.
|
||||
*out++ = endPoint;
|
||||
if (endNode.second)
|
||||
*out++ = endPoint;
|
||||
}
|
||||
|
||||
float PathFinder::getZAngleToNext(float x, float y) const
|
||||
|
|
Loading…
Reference in a new issue