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

Codechange #5859: Simplify CheckTrainStayInDepot() (#7045)

pull/7053/head
Joan Josep 2019-01-12 18:04:04 +01:00 committed by Charles Pigott
parent 0f9d1019e6
commit 96854b2b8b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/train_cmd.cpp
View File

@ -2149,12 +2149,10 @@ static bool CheckTrainStayInDepot(Train *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 */ /* We are leaving a depot, but have to go to the exact same one; re-enter. */
if (v->current_order.IsType(OT_GOTO_DEPOT) && v->tile == v->dest_tile) { if (v->current_order.IsType(OT_GOTO_DEPOT) && v->tile == v->dest_tile) {
/* We need to have a reservation for this to work. */ /* Service when depot has no reservation. */
if (HasDepotReservation(v->tile)) return true; if (!HasDepotReservation(v->tile)) VehicleEnterDepot(v);
SetDepotReservation(v->tile, true);
VehicleEnterDepot(v);
return true; return true;
} }