--- a/tunnel_map.c	Sun Mar 12 12:19:25 2006 +0000
+++ b/tunnel_map.c	Sun Mar 12 15:04:03 2006 +0000
@@ -15,8 +15,7 @@
 	do {
 		tile += delta;
 	} while (
-		!IsTileType(tile, MP_TUNNELBRIDGE) ||
-		GB(_m[tile].m5, 4, 4) != 0 ||
+		!IsTunnelTile(tile) ||
 		GetTunnelDirection(tile) != dir ||
 		GetTileZ(tile) != z
 	);
@@ -37,8 +36,7 @@
 
 	return
 		z == height &&
-		IsTileType(tile, MP_TUNNELBRIDGE) &&
-		GB(_m[tile].m5, 4, 4) == 0 &&
+		IsTunnelTile(tile) &&
 		GetTunnelDirection(tile) == dir;
 }