diff options
| -rw-r--r-- | src/openttd.cpp | 14 | ||||
| -rw-r--r-- | src/train_cmd.cpp | 7 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index e09a8501b..31f175fcb 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -2504,6 +2504,20 @@ bool AfterLoadGame() } } + /* Reserve all tracks trains are currently on. */ + if (CheckSavegameVersion(101)) { + Vehicle *v; + FOR_ALL_VEHICLES(v) { + if (v->type == VEH_TRAIN) { + if ((v->u.rail.track & TRACK_BIT_WORMHOLE) == TRACK_BIT_WORMHOLE) { + TryReserveRailTrack(v->tile, DiagDirToDiagTrack(GetTunnelBridgeDirection(v->tile))); + } else if ((v->u.rail.track & TRACK_BIT_MASK) != TRACK_BIT_NONE) { + TryReserveRailTrack(v->tile, TrackBitsToTrack(v->u.rail.track)); + } + } + } + } + GamelogPrintDebug(1); return InitializeWindowsAndCaches(); diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 37334c0eb..1ecdff208 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3695,6 +3695,8 @@ static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image) return; } goto reverse_train_direction; + } else { + TryReserveRailTrack(gp.new_tile, TrackBitsToTrack(chosen_track)); } } else { static const TrackBits _matching_tracks[8] = { @@ -3777,7 +3779,10 @@ static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image) if (IsTileType(gp.new_tile, MP_TUNNELBRIDGE) && HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) { /* Perform look-ahead on tunnel exit. */ - if (IsFrontEngine(v)) CheckNextTrainTile(v); + if (IsFrontEngine(v)) { + TryReserveRailTrack(gp.new_tile, DiagDirToDiagTrack(GetTunnelBridgeDirection(gp.new_tile))); + CheckNextTrainTile(v); + } } else { v->x_pos = gp.x; v->y_pos = gp.y; |