diff options
| author | celestar <celestar@openttd.org> | 2006-12-27 12:38:02 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2006-12-27 12:38:02 +0000 |
| commit | 8cd5daa5334e8193d47240b78a39afaed6a0473a (patch) | |
| tree | 28100daed109de06e979123edd0601487ecc8261 /road_map.c | |
| parent | 98e6c790e09e550a6cc0585b2084d26f8c7e51f5 (diff) | |
| download | openttd-8cd5daa5334e8193d47240b78a39afaed6a0473a.tar.xz | |
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
Diffstat (limited to 'road_map.c')
| -rw-r--r-- | road_map.c | 18 |
1 files changed, 4 insertions, 14 deletions
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; |