dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use front vehicle for vehicle orders in RV YAPF leader check

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-07-11 22:42:59 +01:00
parent 49fdc9c77a
commit e05f4b2faf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pathfinder/yapf/yapf_road.cpp
View File

@@ -355,12 +355,14 @@ static Vehicle * FindVehiclesOnTileProc(Vehicle *v, void *_data)
{ {
FindVehiclesOnTileProcData *data = (FindVehiclesOnTileProcData*)(_data); FindVehiclesOnTileProcData *data = (FindVehiclesOnTileProcData*)(_data);
if (data->origin_vehicle == v) { const Vehicle *front = v->First();
if (data->origin_vehicle == front) {
return nullptr; return nullptr;
} }
/* only consider vehicles going to the same station as us */ /* only consider vehicles going to the same station as us */
if (!v->current_order.IsType(OT_GOTO_STATION) || data->origin_vehicle->current_order.GetDestination() != v->current_order.GetDestination()) { if (!front->current_order.IsType(OT_GOTO_STATION) || data->origin_vehicle->current_order.GetDestination() != front->current_order.GetDestination()) {
return nullptr; return nullptr;
} }