mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16322) -Fix [FS#2873]: trains could get stuck in a depot when they wanted to go to the same depot again.

release/1.0
rubidium 2009-05-16 20:08:49 +00:00
parent bdbbe3a09b
commit 8324cfc875
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/train_cmd.cpp
View File

@ -2431,6 +2431,15 @@ static bool CheckTrainStayInDepot(Vehicle *v)
seg_state = _settings_game.pf.reserve_paths ? SIGSEG_PBS : UpdateSignalsOnSegment(v->tile, INVALID_DIAGDIR, v->owner); seg_state = _settings_game.pf.reserve_paths ? SIGSEG_PBS : UpdateSignalsOnSegment(v->tile, INVALID_DIAGDIR, v->owner);
} }
/* We are leaving a depot, but have to go to the exact same one; re-enter */
if (v->tile == v->dest_tile) {
/* We need to have a reservation for this to work. */
if (GetDepotWaypointReservation(v->tile)) return true;
SetDepotWaypointReservation(v->tile, true);
VehicleEnterDepot(v);
return true;
}
/* Only leave when we can reserve a path to our destination. */ /* Only leave when we can reserve a path to our destination. */
if (seg_state == SIGSEG_PBS && !TryPathReserve(v) && v->u.rail.force_proceed == 0) { if (seg_state == SIGSEG_PBS && !TryPathReserve(v) && v->u.rail.force_proceed == 0) {
/* No path and no force proceed. */ /* No path and no force proceed. */