--- ray/src/rt/source.c	1989/06/13 10:57:52	1.12
+++ ray/src/rt/source.c	1990/12/13 10:44:04	1.24
@@ -47,10 +47,7 @@ marksources()			/* find and mark source objects */
 
 		m = objptr(o->omod);
 
-		if (m->otype != MAT_LIGHT &&
-				m->otype != MAT_ILLUM &&
-				m->otype != MAT_GLOW &&
-				m->otype != MAT_SPOT)
+		if (!islight(m->otype))
 			continue;
 	
 		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
@@ -310,6 +307,8 @@ char  *p;			/* data for f */
 	double  prob, ourthresh, hwt, test2, hit2;
 	RAY  sr;
 
+	if (nsources <= 0)
+		return;
 	srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
 	cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
 	if (srccnt == NULL || cntord == NULL)
@@ -329,7 +328,7 @@ char  *p;			/* data for f */
 						/* compute coefficient */
 		(*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom);
 		cntord[sn].brt = bright(srccnt[sn].val);
-		if (cntord[sn].brt <= FTINY)
+		if (cntord[sn].brt <= 0.0)
 			continue;
 						/* compute intersection */
 		if (!( source[sn].sflags & SDISTANT ?
@@ -338,22 +337,24 @@ char  *p;			/* data for f */
 				(source[sn].so, &sr) ))
 			continue;
 						/* compute contribution */
-		rayshade(&sr, sr.ro->omod);
+		raycont(&sr);
 		multcolor(srccnt[sn].val, sr.rcol);
 		cntord[sn].brt = bright(srccnt[sn].val);
 	}
 						/* sort contributions */
 	qsort(cntord, nsources, sizeof(CNTPTR), cntcmp);
-                                                /* find last */
-        sn = 0; ncnts = nsources;
-        while (sn < ncnts-1) {
-                register int  m;
-                m = (sn + ncnts) >> 1;
-                if (cntord[m].brt > 0.0)
-                        sn = m;
-                else
-                        ncnts = m;
-        }
+	{					/* find last */
+		register int  l, m;
+
+		sn = 0; ncnts = l = nsources;
+		while ((m = (sn + ncnts) >> 1) != l) {
+			if (cntord[m].brt > 0.0)
+				sn = m;
+			else
+				ncnts = m;
+			l = m;
+		}
+	}
                                                 /* accumulate tail */
         for (sn = ncnts-1; sn > 0; sn--)
                 cntord[sn-1].brt += cntord[sn].brt;
@@ -374,13 +375,11 @@ char  *p;			/* data for f */
 						/* test for hit */
 		rayorigin(&sr, r, SHADOW, 1.0);
 		VCOPY(sr.rdir, srccnt[cntord[sn].sno].dir);
+		sr.rsrc = cntord[sn].sno;
 		if (localhit(&sr, &thescene) &&
 				sr.ro != source[cntord[sn].sno].so) {
 						/* check for transmission */
-			if (sr.clipset != NULL && inset(sr.clipset,sr.ro->omod))
-				raytrans(&sr);		/* object is clipped */
-			else
-				rayshade(&sr, sr.ro->omod);
+			raycont(&sr);
 			if (bright(sr.rcol) <= FTINY)
 				continue;	/* missed! */
 			(*f)(srccnt[cntord[sn].sno].val, p,
@@ -408,8 +407,8 @@ char  *p;			/* data for f */
 		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
 	}
 		
-	free(srccnt);
-	free(cntord);
+	free((char *)srccnt);
+	free((char *)cntord);
 }
 
 
@@ -429,9 +428,6 @@ m_light(m, r)			/* ray hit a light source */
 register OBJREC  *m;
 register RAY  *r;
 {
-						/* check for behind */
-	if (r->rod < 0.0)
-		return;
 						/* check for over-counting */
 	if (wrongsource(m, r) || badambient(m, r))
 		return;
@@ -445,6 +441,9 @@ register RAY  *r;
 
 						/* otherwise treat as source */
 	} else {
+						/* check for behind */
+		if (r->rod < 0.0)
+			return;
 						/* get distribution pattern */
 		raytexture(r, m->omod);
 						/* get source color */
@@ -453,8 +452,7 @@ register RAY  *r;
 				  m->oargs.farg[2]);
 						/* modify value */
 		multcolor(r->rcol, r->pcol);
+						/* assign distance */
+		r->rt = r->rot;
 	}
 }
-
-
-o_source() {}		/* intersection with a source is done elsewhere */