mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Split closest peep calculation into Staff and Guest (#13880)

This commit is contained in:
Duncan 2021-01-20 13:21:22 +00:00 committed by GitHub
parent 19f0d8dfe9
commit 8d25e4ccd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@ -697,6 +697,34 @@ static void ViewportInteractionRemoveLargeScenery(TileElement* tileElement, cons
}
}
struct PeepDistance
{
Peep* peep = nullptr;
int32_t distance = std::numeric_limits<decltype(distance)>::max();
};
template<typename T>
PeepDistance GetClosestPeep(const ScreenCoordsXY& viewportCoords, const int32_t maxDistance, PeepDistance goal)
{
for (auto peep : EntityList<T>(EntityListId::Peep))
{
if (peep->sprite_left == LOCATION_NULL)
continue;
auto distance = abs(((peep->sprite_left + peep->sprite_right) / 2) - viewportCoords.x)
+ abs(((peep->sprite_top + peep->sprite_bottom) / 2) - viewportCoords.y);
if (distance > maxDistance)
continue;
if (distance < goal.distance)
{
goal.peep = peep;
goal.distance = distance;
}
}
return goal;
}
static Peep* ViewportInteractionGetClosestPeep(ScreenCoordsXY screenCoords, int32_t maxDistance)
{
rct_window* w;
@ -712,26 +740,10 @@ static Peep* ViewportInteractionGetClosestPeep(ScreenCoordsXY screenCoords, int3
auto viewportCoords = viewport->ScreenToViewportCoord(screenCoords);
Peep* closestPeep = nullptr;
auto closestDistance = std::numeric_limits<int32_t>::max();
for (auto peep : EntityList<Peep>(EntityListId::Peep))
{
if (peep->sprite_left == LOCATION_NULL)
continue;
auto goal = GetClosestPeep<Guest>(viewportCoords, maxDistance, {});
goal = GetClosestPeep<Staff>(viewportCoords, maxDistance, goal);
auto distance = abs(((peep->sprite_left + peep->sprite_right) / 2) - viewportCoords.x)
+ abs(((peep->sprite_top + peep->sprite_bottom) / 2) - viewportCoords.y);
if (distance > maxDistance)
continue;
if (distance < closestDistance)
{
closestPeep = peep;
closestDistance = distance;
}
}
return closestPeep;
return goal.peep;
}
/**