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

Fix limit train lookahead to signal aspect within signalled tunnel/bridges

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-22 00:24:13 +01:00
parent 387e646439
commit b6e099121a
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pbs.cpp
View File

@@ -999,6 +999,7 @@ void SetTrainReservationLookaheadEnd(Train *v)
int32 threshold = v->lookahead->current_position + 24; int32 threshold = v->lookahead->current_position + 24;
uint8 known_signals_ahead = 1; uint8 known_signals_ahead = 1;
for (const TrainReservationLookAheadItem &item : v->lookahead->items) { for (const TrainReservationLookAheadItem &item : v->lookahead->items) {
if (item.end >= v->lookahead->reservation_end_position) break;
if (item.type == TRLIT_SIGNAL) { if (item.type == TRLIT_SIGNAL) {
if (item.start <= threshold) { if (item.start <= threshold) {
/* Signal is within visual range */ /* Signal is within visual range */

1
src/train_cmd.cpp
View File

@@ -4083,6 +4083,7 @@ static TileIndex CheckLongReservePbsTunnelBridgeOnTrackdir(Train* v, TileIndex t
} else { } else {
raw_free_tiles = GetAvailableFreeTilesInSignalledTunnelBridgeWithStartOffset(tile, end, v->lookahead->tunnel_bridge_reserved_tiles + 1); raw_free_tiles = GetAvailableFreeTilesInSignalledTunnelBridgeWithStartOffset(tile, end, v->lookahead->tunnel_bridge_reserved_tiles + 1);
ApplyAvailableFreeTunnelBridgeTiles(v->lookahead.get(), raw_free_tiles, tile, end); ApplyAvailableFreeTunnelBridgeTiles(v->lookahead.get(), raw_free_tiles, tile, end);
SetTrainReservationLookaheadEnd(v);
} }
} else { } else {
raw_free_tiles = GetAvailableFreeTilesInSignalledTunnelBridge(tile, end, tile); raw_free_tiles = GetAvailableFreeTilesInSignalledTunnelBridge(tile, end, tile);