--- ray/src/rt/source.c	2003/02/25 02:47:23	2.30
+++ ray/src/rt/source.c	2003/06/24 15:37:01	2.34
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: source.c,v 2.30 2003/02/25 02:47:23 greg Exp $";
+static const char RCSid[] = "$Id: source.c,v 2.34 2003/06/24 15:37:01 greg Exp $";
 #endif
 /*
  *  source.c - routines dealing with illumination sources.
@@ -54,7 +54,7 @@ marksources()			/* find and mark source objects */
 					/* initialize dispatch table */
 	initstypes();
 					/* find direct sources */
-	for (i = 0; i < nobjects; i++) {
+	for (i = 0; i < nsceneobjs; i++) {
 	
 		o = objptr(i);
 
@@ -250,6 +250,8 @@ register RAY  *r;
 		for (i = 0; i < 3; i++)
 			r->ron[i] = -r->rdir[i];
 		r->rod = 1.0;
+		r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
+		r->uv[0] = r->uv[1] = 0.0;
 		r->rox = NULL;
 		return(1);
 	}
@@ -291,9 +293,9 @@ char  *p;			/* data for f */
 	for (sn = 0; srcray(&sr, r, &si); sn++) {
 		if (sn >= maxcntr) {
 			maxcntr = sn + MAXSPART;
-			srccnt = (CONTRIB *)realloc((char *)srccnt,
+			srccnt = (CONTRIB *)realloc((void *)srccnt,
 					maxcntr*sizeof(CONTRIB));
-			cntord = (CNTPTR *)realloc((char *)cntord,
+			cntord = (CNTPTR *)realloc((void *)cntord,
 					maxcntr*sizeof(CNTPTR));
 			if (srccnt == NULL | cntord == NULL)
 				error(SYSTEM, "out of memory in direct");
@@ -353,7 +355,11 @@ char  *p;			/* data for f */
 		rayorigin(&sr, r, SHADOW, 1.0);
 		VCOPY(sr.rdir, scp->dir);
 		sr.rsrc = scp->sno;
-		source[scp->sno].ntests++;	/* keep statistics */
+						/* keep statistics */
+		if (source[scp->sno].ntests++ > 0xfffffff0) {
+			source[scp->sno].ntests >>= 1;
+			source[scp->sno].nhits >>= 1;
+		}
 		if (localhit(&sr, &thescene) &&
 				( sr.ro != source[scp->sno].so ||
 				source[scp->sno].sflags & SFOLLOW )) {