From ed04410f8920a5481aa6d249a89cd78309b3785b Mon Sep 17 00:00:00 2001 From: yexo Date: Tue, 8 Nov 2011 17:51:29 +0000 Subject: [PATCH] (svn r23163) -Fix [FS#4627]: don't display railway fences between track and waypoints (Krille) --- src/rail_cmd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 5f96e3d7cf..6196d78afc 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -2453,7 +2453,7 @@ static void TileLoop_Track(TileIndex tile) TileIndex n = tile + TileDiffXY(0, -1); TrackBits nrail = (IsPlainRailTile(n) ? GetTrackBits(n) : TRACK_BIT_NONE); - if (!IsTileType(n, MP_RAILWAY) || + if ((!IsTileType(n, MP_RAILWAY) && !IsRailWaypointTile(n)) || !IsTileOwner(n, owner) || nrail == TRACK_BIT_UPPER || nrail == TRACK_BIT_LEFT) { @@ -2468,7 +2468,7 @@ static void TileLoop_Track(TileIndex tile) TileIndex n = tile + TileDiffXY(0, 1); TrackBits nrail = (IsPlainRailTile(n) ? GetTrackBits(n) : TRACK_BIT_NONE); - if (!IsTileType(n, MP_RAILWAY) || + if ((!IsTileType(n, MP_RAILWAY) && !IsRailWaypointTile(n)) || !IsTileOwner(n, owner) || nrail == TRACK_BIT_LOWER || nrail == TRACK_BIT_RIGHT) { @@ -2484,7 +2484,7 @@ static void TileLoop_Track(TileIndex tile) TileIndex n = tile + TileDiffXY(-1, 0); TrackBits nrail = (IsPlainRailTile(n) ? GetTrackBits(n) : TRACK_BIT_NONE); - if (!IsTileType(n, MP_RAILWAY) || + if ((!IsTileType(n, MP_RAILWAY) && !IsRailWaypointTile(n)) || !IsTileOwner(n, owner) || nrail == TRACK_BIT_UPPER || nrail == TRACK_BIT_RIGHT) { @@ -2499,7 +2499,7 @@ static void TileLoop_Track(TileIndex tile) TileIndex n = tile + TileDiffXY(1, 0); TrackBits nrail = (IsPlainRailTile(n) ? GetTrackBits(n) : TRACK_BIT_NONE); - if (!IsTileType(n, MP_RAILWAY) || + if ((!IsTileType(n, MP_RAILWAY) && !IsRailWaypointTile(n)) || !IsTileOwner(n, owner) || nrail == TRACK_BIT_LOWER || nrail == TRACK_BIT_LEFT) {