--- a/smallmap_gui.c	Thu Dec 28 16:11:07 2006 +0000
+++ b/smallmap_gui.c	Thu Dec 28 17:21:22 2006 +0000
@@ -345,23 +345,14 @@
 
 static inline TileType GetEffectiveTileType(TileIndex tile)
 {
-	TileType t = GetTileType(tile);
-
-	if (t == MP_TUNNELBRIDGE) {
-		TransportType tt;
-
-		if (IsTunnel(tile)) {
-			tt = GetTunnelTransportType(tile);
-		} else {
-			tt = GetBridgeTransportType(tile);
-		}
-		switch (tt) {
-			case TRANSPORT_RAIL: t = MP_RAILWAY; break;
-			case TRANSPORT_ROAD: t = MP_STREET;  break;
-			default:             t = MP_WATER;   break;
-		}
+	switch (GetTileType(tile)) {
+		case MP_STREET_BRIDGE:  return MP_STREET;
+		case MP_RAILWAY_BRIDGE: return MP_RAILWAY;
+		case MP_TUNNEL:
+			if (GetTunnelTransportType(tile) == TRANSPORT_RAIL) return MP_RAILWAY;
+			return MP_STREET;
+		default: return GetTileType(tile);
 	}
-	return t;
 }
 
 /**