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

Merge pull request #2586 from techfreek/closest-engineer 

Improved mechanic selection for broken down rides
This commit is contained in:
Ted John 2016-01-02 10:52:23 +00:00
parent c1d33e7308 2c7f0d6ae2
commit 367f1252c0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ride/ride.c
View File

@ -2466,7 +2466,7 @@ rct_peep *find_closest_mechanic(int x, int y, int forInspection)
uint16 spriteIndex;
rct_peep *peep, *closestMechanic = NULL;
closestDistance = -1;
closestDistance = UINT_MAX;
FOR_ALL_STAFF(spriteIndex, peep) {
if (peep->staff_type != STAFF_TYPE_MECHANIC)
continue;
@ -2493,15 +2493,15 @@ rct_peep *find_closest_mechanic(int x, int y, int forInspection)
if (peep->x == (sint16)0x8000)
continue;
// Should probably be euclidean or manhattan distance, this seems a bit naive
distance = max(abs(peep->x - x), abs(peep->y - y));
// manhattan distance
distance = abs(peep->x - x) + abs(peep->y - y);
if (distance < closestDistance) {
closestDistance = distance;
closestMechanic = peep;
}
}
return closestDistance == -1 ? NULL : closestMechanic;
return closestMechanic;
}
rct_peep *ride_get_assigned_mechanic(rct_ride *ride)