diff options
| author | frosch <frosch@openttd.org> | 2008-08-22 22:42:21 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-08-22 22:42:21 +0000 |
| commit | 9fe035f8e81803d6972410a1706905e3551e0b1c (patch) | |
| tree | c9ecef80734fbff5f65e4a5f515493be0cd4fef1 | |
| parent | f2623e7c0999bd6d67a56d6c97238b779e384dc6 (diff) | |
| download | openttd-9fe035f8e81803d6972410a1706905e3551e0b1c.tar.xz | |
(svn r14131) -Fix (r13952) [FS#2250]: The reservation of adjacent stations was sometimes not freed correctly. (michi_cc)
| -rw-r--r-- | src/train_cmd.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 0dfa2189e..344d35981 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2464,6 +2464,7 @@ void FreeTrainTrackReservation(const Vehicle *v, TileIndex origin, Trackdir orig TileIndex tile = origin != INVALID_TILE ? origin : v->tile; Trackdir td = orig_td != INVALID_TRACKDIR ? orig_td : GetVehicleTrackdir(v); bool free_tile = tile != v->tile || !(IsRailwayStationTile(v->tile) || IsTileType(v->tile, MP_TUNNELBRIDGE)); + StationID station_id = IsRailwayStationTile(v->tile) ? GetStationIndex(v->tile) : INVALID_STATION; /* Don't free reservation if it's not ours. */ if (TracksOverlap(GetReservedTrackbits(tile) | TrackToTrackBits(TrackdirToTrack(td)))) return; @@ -2498,7 +2499,7 @@ void FreeTrainTrackReservation(const Vehicle *v, TileIndex origin, Trackdir orig } /* Don't free first station/bridge/tunnel if we are on it. */ - if (free_tile || (!ft.m_is_station && !ft.m_is_tunnel && !ft.m_is_bridge)) ClearPathReservation(tile, td); + if (free_tile || (!(ft.m_is_station && GetStationIndex(ft.m_new_tile) == station_id) && !ft.m_is_tunnel && !ft.m_is_bridge)) ClearPathReservation(tile, td); free_tile = true; } |