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

Fix case where trains were unable to exit signalled bridge/tunnels

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-02-18 02:45:45 +00:00
parent 4c8b358ffe
commit 8ec9f5e174
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/train_cmd.cpp
View File

@@ -3229,7 +3229,7 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
}
if (IsTileType(v->tile, MP_TUNNELBRIDGE) && IsTunnelBridgeSignalSimulationExitOnly(v->tile) &&
(GetAcrossTunnelBridgeTrackBits(v->tile) & v->track)) {
TrackdirEntersTunnelBridge(v->tile, v->GetVehicleTrackdir())) {
// prevent any attempt to reserve the wrong way onto a tunnel/bridge exit
return false;
}
@@ -4098,7 +4098,8 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
v->vehstatus |= VS_TRAIN_SLOWING;
return false;
}
if (IsTunnelBridgeSignalSimulationExitOnly(gp.new_tile)) {
if (IsTunnelBridgeSignalSimulationExitOnly(gp.new_tile) &&
TrackdirEntersTunnelBridge(gp.new_tile, TrackDirectionToTrackdir(FindFirstTrack(chosen_track), chosen_dir))) {
v->cur_speed = 0;
goto invalid_rail;
}