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

Drive through depots: Allow moving between ends when current exit blocked

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-04-25 18:45:11 +01:00
parent 0e3784cdb1
commit 6b2a05d02e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/train_cmd.cpp
View File

@@ -3149,6 +3149,7 @@ static bool CheckTrainStayInDepot(Train *v)
} }
SigSegState seg_state; SigSegState seg_state;
bool exit_blocked = false;
if (v->force_proceed == TFP_NONE) { if (v->force_proceed == TFP_NONE) {
/* force proceed was not pressed */ /* force proceed was not pressed */
@@ -3161,7 +3162,7 @@ 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);
if (seg_state == SIGSEG_FULL || HasDepotReservation(v->tile)) { if (seg_state == SIGSEG_FULL || HasDepotReservation(v->tile)) {
/* Full and no PBS signal in block or depot reserved, can't exit. */ /* Full and no PBS signal in block or depot reserved, can't exit. */
return true; exit_blocked = true;
} }
} else { } else {
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);
@@ -3169,6 +3170,7 @@ static bool CheckTrainStayInDepot(Train *v)
/* 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) {
if (exit_blocked) return true;
/* Service when depot has no reservation. */ /* Service when depot has no reservation. */
if (!HasDepotReservation(v->tile)) VehicleEnterDepot(v); if (!HasDepotReservation(v->tile)) VehicleEnterDepot(v);
return true; return true;
@@ -3223,6 +3225,8 @@ static bool CheckTrainStayInDepot(Train *v)
} }
} }
if (exit_blocked) 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->force_proceed == TFP_NONE) { if (seg_state == SIGSEG_PBS && !TryPathReserve(v) && v->force_proceed == TFP_NONE) {
/* No path and no force proceed. */ /* No path and no force proceed. */