diff -r eec5a7dcbf61 -r fcf5fb2548eb src/road_map.cpp
--- a/src/road_map.cpp	Mon Apr 14 20:32:36 2008 +0000
+++ b/src/road_map.cpp	Tue Apr 15 00:47:19 2008 +0000
@@ -7,14 +7,13 @@
 #include "bridge_map.h"
 #include "tile_cmd.h"
 #include "road_map.h"
-#include "station.h"
 #include "tunnel_map.h"
 #include "station_map.h"
 #include "depot.h"
 #include "tunnelbridge_map.h"
 
 
-RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt)
+RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt, bool straight_tunnel_bridge_entrance)
 {
 	if (!HasTileRoadType(tile, rt)) return ROAD_NONE;
 
@@ -34,7 +33,9 @@
 
 		case MP_TUNNELBRIDGE:
 			if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return ROAD_NONE;
-			return DiagDirToRoadBits(ReverseDiagDir(GetTunnelBridgeDirection(tile)));
+			return straight_tunnel_bridge_entrance ?
+					AxisToRoadBits(DiagDirToAxis(GetTunnelBridgeDirection(tile))) :
+					DiagDirToRoadBits(ReverseDiagDir(GetTunnelBridgeDirection(tile)));
 
 		default: return ROAD_NONE;
 	}