summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2011-11-08 17:51:29 +0000
committeryexo <yexo@openttd.org>2011-11-08 17:51:29 +0000
commited04410f8920a5481aa6d249a89cd78309b3785b (patch)
tree48193be221a874b57c44b062b9a0d725f645988c
parent6701a2af4508f78f6c3fa94e932f40f3f0fdfc1a (diff)
downloadopenttd-ed04410f8920a5481aa6d249a89cd78309b3785b.tar.xz
(svn r23163) -Fix [FS#4627]: don't display railway fences between track and waypoints (Krille)
-rw-r--r--src/rail_cmd.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 5f96e3d7c..6196d78af 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) {