--- ray/src/rt/ray.h	1995/12/09 09:35:00	2.6
+++ ray/src/rt/ray.h	1997/03/07 16:53:02	2.11
@@ -16,8 +16,6 @@
 
 #define  MAXDIM		32	/* maximum number of dimensions */
 
-#define  MAXSLIST	32	/* maximum sources to check */
-
 				/* ray type flags */
 #define  PRIMARY	01		/* original ray */
 #define  SHADOW		02		/* ray to light source */
@@ -44,7 +42,8 @@ typedef struct ray {
 	OBJECT  *clipset;	/* set of objects currently clipped */
 	OBJECT  *newcset;	/* next clipset, used for transmission */
 	int  (*revf)();		/* evaluation function for this ray */
- 	OBJREC  *ro;		/* intersected object */
+	OBJECT	robj;		/* intersected object number */
+ 	OBJREC  *ro;		/* intersected object (one with material) */
 	double  rot;		/* distance to object */
 	FVECT  rop;		/* intersection point */
 	FVECT  ron;		/* intersection surface normal */
@@ -55,7 +54,7 @@ typedef struct ray {
 	COLOR  rcol;		/* returned ray value */
 	double  rt;		/* returned effective ray length */
 	COLOR  cext;		/* medium extinction coefficient */
-	float  albedo;		/* medium scattering albedo */
+	COLOR  albedo;		/* medium scattering albedo */
 	float  gecc;		/* scattering eccentricity coefficient */
 	int  *slights;		/* list of lights to test for scattering */
 }  RAY;
@@ -64,7 +63,7 @@ extern int  raytrace();
 
 extern double  raynormal();
 
-extern double  raydistance();
+extern double  raydist();
 
 extern int  dimlist[];		/* dimension list for distribution */
 extern int  ndims;		/* number of dimensions so far */