From ad703d747034465c3f1f959a0bc8366dff09506c Mon Sep 17 00:00:00 2001 From: psi29a Date: Wed, 8 Sep 2021 09:55:42 +0000 Subject: [PATCH] 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 (cherry picked from commit 4bf22f3ca0e5e5776c09cb8d5ad9793986373975) 9112c65a Use pathgrid path when destination is closer to different graph component node --- apps/openmw/mwmechanics/pathfinding.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp index 2f8e83043..0e704cd46 100644 --- a/apps/openmw/mwmechanics/pathfinding.cpp +++ b/apps/openmw/mwmechanics/pathfinding.cpp @@ -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