gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature: Constantly update destination of 'any depot' orders

Browse Source
This commit is contained in:
Nicolas Chappe 2022-07-27 18:56:58 +02:00 committed by Michael Lutz
parent a4052ca348
commit 721d98a7d0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/train_cmd.cpp
View File

@ -2541,6 +2541,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir,
Track best_track = INVALID_TRACK; Track best_track = INVALID_TRACK;
bool do_track_reservation = _settings_game.pf.reserve_paths || force_res; bool do_track_reservation = _settings_game.pf.reserve_paths || force_res;
bool changed_signal = false; bool changed_signal = false;
TileIndex final_dest = INVALID_TILE;
assert((tracks & ~TRACK_BIT_MASK) == 0); assert((tracks & ~TRACK_BIT_MASK) == 0);
@ -2613,7 +2614,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir,
bool path_found = true; bool path_found = true;
TileIndex new_tile = res_dest.tile; TileIndex new_tile = res_dest.tile;
Track next_track = DoTrainPathfind(v, new_tile, dest_enterdir, tracks, path_found, do_track_reservation, &res_dest, nullptr); Track next_track = DoTrainPathfind(v, new_tile, dest_enterdir, tracks, path_found, do_track_reservation, &res_dest, &final_dest);
if (new_tile == tile) best_track = next_track; if (new_tile == tile) best_track = next_track;
v->HandlePathfindingResult(path_found); v->HandlePathfindingResult(path_found);
} }
@ -2687,6 +2688,15 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir,
if (changed_signal) MarkTileDirtyByTile(tile); if (changed_signal) MarkTileDirtyByTile(tile);
orders.Restore();
if (v->current_order.IsType(OT_GOTO_DEPOT) &&
(v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) &&
final_dest != INVALID_TILE && IsRailDepotTile(final_dest)) {
v->current_order.SetDestination(GetDepotIndex(final_dest));
v->dest_tile = final_dest;
SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
}
return best_track; return best_track;
} }