From 8cd5daa5334e8193d47240b78a39afaed6a0473a Mon Sep 17 00:00:00 2001 From: celestar Date: Wed, 27 Dec 2006 12:38:02 +0000 Subject: (svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals) --- road_map.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'road_map.c') diff --git a/road_map.c b/road_map.c index 5c386bad1..cccd2e76a 100644 --- a/road_map.c +++ b/road_map.c @@ -27,22 +27,12 @@ RoadBits GetAnyRoadBits(TileIndex tile) return DiagDirToRoadBits(GetRoadStopDir(tile)); case MP_TUNNELBRIDGE: - if (IsBridge(tile)) { - if (IsBridgeMiddle(tile)) { - if (!IsTransportUnderBridge(tile) || - GetTransportTypeUnderBridge(tile) != TRANSPORT_ROAD) { - return 0; - } - return GetRoadBitsUnderBridge(tile); - } else { - // ending - if (GetBridgeTransportType(tile) != TRANSPORT_ROAD) return 0; - return DiagDirToRoadBits(ReverseDiagDir(GetBridgeRampDirection(tile))); - } - } else { - // tunnel + if (IsTunnel(tile)) { if (GetTunnelTransportType(tile) != TRANSPORT_ROAD) return 0; return DiagDirToRoadBits(ReverseDiagDir(GetTunnelDirection(tile))); + } else { + if (GetBridgeTransportType(tile) != TRANSPORT_ROAD) return 0; + return DiagDirToRoadBits(ReverseDiagDir(GetBridgeRampDirection(tile))); } default: return 0; -- cgit v1.2.3-54-g00ecf