Skip to content

bugfix(pathfinder): Fix inaccurate single unit movement destinations when unobstructed #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 3 commits into from
Jun 18, 2026
Merged

bugfix(pathfinder): Fix inaccurate single unit movement destinations when unobstructed #2296

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8814291
bugfix(pathfinder): Accurate unit movement destinations when unobstru…
stephanmeesters Jun 15, 2026
e6fbda2
Use RETAIL_COMPATIBLE_PATHFINDING
stephanmeesters Jun 16, 2026
4c1f782
Process review comments
stephanmeesters Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions Core/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5529,12 +5529,12 @@ Bool Pathfinder::adjustDestination(Object *obj, const LocomotorSet& locomotorSet
Bool center;
getRadiusAndCenter(obj, iRadius, center);
ICoord2D cell;
Coord3D adjustDest = *dest;
Coord3D cellDest = *dest;
if (!center) {
adjustDest.x += PATHFIND_CELL_SIZE_F/2;
adjustDest.y += PATHFIND_CELL_SIZE_F/2;
cellDest.x += PATHFIND_CELL_SIZE_F/2;
cellDest.y += PATHFIND_CELL_SIZE_F/2;
}
worldToCell( &adjustDest, &cell );
worldToCell( &cellDest, &cell );
PathfindLayerEnum layer = TheTerrainLogic->getLayerForDestination(dest);
if (groupDest) {
layer = TheTerrainLogic->getLayerForDestination(groupDest);
Expand All @@ -5543,9 +5543,24 @@ Bool Pathfinder::adjustDestination(Object *obj, const LocomotorSet& locomotorSet
Int i = cell.x;
Int j = cell.y;
// Check the center cell
if (checkForAdjust(obj, locomotorSet, isHuman, i,j, layer, iRadius, center, dest, groupDest)) {
#if RETAIL_COMPATIBLE_PATHFINDING
if (checkForAdjust(obj, locomotorSet, isHuman, i, j, layer, iRadius, center, dest, groupDest)) {
return true;
}
#else
Coord3D adjustDest = *dest;
if (checkForAdjust(obj, locomotorSet, isHuman, i, j, layer, iRadius, center, &adjustDest, groupDest)) {
// TheSuperHackers @bugfix stephanmeesters 15/06/2026 Destination adjustment always snaps to the nearest grid cell
// even when no adjustment is necessary because there are no obstructions. For single units this adjustment
// can be skipped in order to provide more accurate movement, which is especially noticeable for chinooks.
const Bool singleUnit = obj && obj->getGroup() && obj->getGroup()->getCount() == 1;
const Bool useExactDestination = isHuman && singleUnit;
if (!useExactDestination) {
*dest = adjustDest;
}
return true;
}
#endif

// TheSuperHackers @info Expanding counter-clockwise spiral search around center cell C. Each full lap walks right->up->left->down.
// After every pair of directions (right+up, then left+down) length of the segment grows by 1.
Expand Down
Loading