diff -r 3c3f27c720d6 -r a8b6dffead63 src/ai/trolly/pathfinder.cpp
--- a/src/ai/trolly/pathfinder.cpp	Sun Dec 16 19:28:07 2007 +0000
+++ b/src/ai/trolly/pathfinder.cpp	Sun Dec 16 19:30:42 2007 +0000
@@ -45,10 +45,7 @@
 	return
 		// MP_ROAD, but not a road depot?
 		(IsTileType(tile, MP_ROAD) && !IsTileDepotType(tile, TRANSPORT_ROAD)) ||
-		(IsTileType(tile, MP_TUNNELBRIDGE) && (
-			(IsTunnel(tile) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD) ||
-			(IsBridge(tile) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD)
-		));
+		(IsTileType(tile, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD);
 }
 
 
@@ -236,11 +233,7 @@
 			// If the next step is a bridge, we have to enter it the right way
 			if (!PathFinderInfo->rail_or_road && IsRoad(atile)) {
 				if (IsTileType(atile, MP_TUNNELBRIDGE)) {
-					if (IsTunnel(atile)) {
-						if (GetTunnelBridgeDirection(atile) != i) continue;
-					} else {
-						if (GetTunnelBridgeDirection(atile) != i) continue;
-					}
+					if (GetTunnelBridgeDirection(atile) != i) continue;
 				}
 			}