Skip to content

Fix the per-step check for a path toward an item or object #253

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

Open
ResurrectedTrader wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −12
Open

Fix the per-step check for a path toward an item or object #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions source/D2Common/src/Path/PathMisc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,22 +1180,22 @@ BOOL sub_6FD5DB70(D2DynamicPathStrc* pDynamicPath)
D2PathPointStrc a3;
sub_6FDAB940(&a3, pDynamicPath);

if (pTargetUnit)
// Only a player or monster target that moved re-paths here, any other target keeps the current path
if (pTargetUnit && (pTargetUnit->dwUnitType == UNIT_PLAYER || pTargetUnit->dwUnitType == UNIT_MONSTER))
{
if (pTargetUnit->dwUnitType == UNIT_PLAYER || pTargetUnit->dwUnitType == UNIT_MONSTER)
const int nAbsDiffX = std::abs(pDynamicPath->tPrevTargetCoord.X - a3.X);
const int nAbsDiffY = std::abs(pDynamicPath->tPrevTargetCoord.Y - a3.Y);
if (nAbsDiffX > 5 || nAbsDiffY > 5)
{
const int nAbsDiffX = std::abs(pDynamicPath->tPrevTargetCoord.X - a3.X);
const int nAbsDiffY = std::abs(pDynamicPath->tPrevTargetCoord.Y - a3.Y);
if (nAbsDiffX <= 5 && nAbsDiffY <= 5)
{
if (pDynamicPath->dwCurrentPointIdx < pDynamicPath->dwPathPoints
|| pDynamicPath->tFinalTargetCoord == pDynamicPath->tGameCoords.ToPathPoint() )
{
return TRUE;
}
}
return D2Common_10236(pDynamicPath->pUnit, TRUE);
}
}

if (pDynamicPath->dwCurrentPointIdx < pDynamicPath->dwPathPoints
|| pDynamicPath->tFinalTargetCoord == pDynamicPath->tGameCoords.ToPathPoint())
{
return TRUE;
}
return D2Common_10236(pDynamicPath->pUnit, TRUE);
}

Expand Down
Loading