From be88e269b918b365695e84cfa962e8d21b98e759 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 7 Jun 2006 19:35:21 +0000 Subject: (svn r5155) - Remove the bridge branch merge (revision r5070) --- rail.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'rail.c') diff --git a/rail.c b/rail.c index aa2865cb3..5b6650667 100644 --- a/rail.c +++ b/rail.c @@ -104,6 +104,7 @@ const Trackdir _dir_to_diag_trackdir[] = { RailType GetTileRailType(TileIndex tile, Trackdir trackdir) { + DiagDirection exitdir = TrackdirToExitdir(trackdir); switch (GetTileType(tile)) { case MP_RAILWAY: return GetRailType(tile); @@ -123,8 +124,21 @@ RailType GetTileRailType(TileIndex tile, Trackdir trackdir) return GetRailType(tile); } } else { - if (GetBridgeTransportType(tile) == TRANSPORT_RAIL) { - return GetRailType(tile); + if (IsBridgeRamp(tile)) { + if (GetBridgeTransportType(tile) == TRANSPORT_RAIL) { + return GetRailType(tile); + } + } else { + if (GetBridgeAxis(tile) == DiagDirToAxis(exitdir)) { + if (GetBridgeTransportType(tile) == TRANSPORT_RAIL) { + return GetRailTypeOnBridge(tile); + } + } else { + if (IsTransportUnderBridge(tile) && + GetTransportTypeUnderBridge(tile) == TRANSPORT_RAIL) { + return GetRailType(tile); + } + } } } break; -- cgit v1.2.3-54-g00ecf