--- ray/src/rt/raytrace.c	1991/06/20 13:29:32	1.21
+++ ray/src/rt/raytrace.c	1991/11/12 17:09:44	2.1
@@ -26,7 +26,7 @@ extern int  do_irrad;			/* compute irradiance? */
 long  raynum = 0L;			/* next unique ray number */
 long  nrays = 0L;			/* number of calls to localhit */
 
-static double  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
+static FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
 OBJREC  Lamb = {
 	OVOID, MAT_PLASTIC, "Lambertian",
 	{0, 5, NULL, Lambfa}, NULL, -1,
@@ -64,6 +64,14 @@ double  rw;
 		r->crtype = ro->crtype | (r->rtype = rt);
 		VCOPY(r->rorg, ro->rop);
 	}
+	rayclear(r);
+	return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
+}
+
+
+rayclear(r)			/* clear a ray for (re)evaluation */
+register RAY  *r;
+{
 	r->rno = raynum++;
 	r->newcset = r->clipset;
 	r->ro = NULL;
@@ -72,7 +80,6 @@ double  rw;
 	setcolor(r->pcol, 1.0, 1.0, 1.0);
 	setcolor(r->rcol, 0.0, 0.0, 0.0);
 	r->rt = 0.0;
-	return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
 }