From 68ead6b84f56ad3c93d05ad3e09b7fbb8173cf26 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 22 Jul 2009 08:59:57 +0000 Subject: (svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types. -Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible. --- src/pbs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pbs.cpp') diff --git a/src/pbs.cpp b/src/pbs.cpp index 1309d01ee..5045fc0f8 100644 --- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -26,7 +26,7 @@ TrackBits GetReservedTrackbits(TileIndex t) break; case MP_STATION: - if (IsRailwayStation(t)) return GetStationReservationTrackBits(t); + if (IsRailwayStation(t) || IsRailWaypoint(t)) return GetStationReservationTrackBits(t); break; case MP_TUNNELBRIDGE: @@ -99,7 +99,7 @@ bool TryReserveRailTrack(TileIndex tile, Track t) break; case MP_STATION: - if (IsRailwayStation(tile) && !HasStationReservation(tile)) { + if ((IsRailwayStation(tile) || IsRailWaypoint(tile)) && !HasStationReservation(tile)) { SetRailwayStationReservation(tile, true); MarkTileDirtyByTile(tile); // some GRFs need redraw after reserving track return true; @@ -150,7 +150,7 @@ bool TryReserveRailTrack(TileIndex tile, Track t) break; case MP_STATION: - if (IsRailwayStation(tile)) { + if (IsRailwayStation(tile) || IsRailWaypoint(tile)) { SetRailwayStationReservation(tile, false); MarkTileDirtyByTile(tile); } -- cgit v1.2.3-54-g00ecf