(svn r5070) Merged the bridge branch

-Feature: Bridges can now be placed above:
	Any railway track combination (excluding depots and waypoints)
	Any road combination (excluding depots)
	Clear tiles (duh), including fields
	Tunnel entrances
	Bridge heads

Thanks to Tron for idea and implementation, KUDr for the yapf synchronization and many others for hours of testing

There are still a number of visual problems remaining, especially when electric railways are on or under the bridge.
DO NOT REPORT THOSE BUGS FOR THE TIME BEING please.

1 files changed, 2 insertions, 16 deletions

diff --git a/rail.c b/rail.c
index 5b6650667..aa2865cb3 100644
--- a/rail.c
+++ b/rail.c
@@ -104,7 +104,6 @@ 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);
@@ -124,21 +123,8 @@ RailType GetTileRailType(TileIndex tile, Trackdir trackdir)
 					return GetRailType(tile);
 				}
 			} else {
-				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);
-						}
-					}
+				if (GetBridgeTransportType(tile) == TRANSPORT_RAIL) {
+					return GetRailType(tile);
 				}
 			}
 			break;