From 96854b2b8bea85926113326e1fd37ee357f7e59e Mon Sep 17 00:00:00 2001 From: Joan Josep Date: Sat, 12 Jan 2019 18:04:04 +0100 Subject: Codechange #5859: Simplify CheckTrainStayInDepot() (#7045) --- src/train_cmd.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index c8387d0a9..01aa946ed 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -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); } - /* 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) { - /* We need to have a reservation for this to work. */ - if (HasDepotReservation(v->tile)) return true; - SetDepotReservation(v->tile, true); - VehicleEnterDepot(v); + /* Service when depot has no reservation. */ + if (!HasDepotReservation(v->tile)) VehicleEnterDepot(v); return true; } -- cgit v1.2.3-54-g00ecf