--- ray/src/rt/raytrace.c	2005/07/08 05:52:29	2.54
+++ ray/src/rt/raytrace.c	2010/09/26 15:51:15	2.61
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: raytrace.c,v 2.54 2005/07/08 05:52:29 greg Exp $";
+static const char RCSid[] = "$Id: raytrace.c,v 2.61 2010/09/26 15:51:15 greg Exp $";
 #endif
 /*
  *  raytrace.c - routines for tracing and shading rays.
@@ -17,13 +17,13 @@ static const char RCSid[] = "$Id: raytrace.c,v 2.54 20
 
 #define  MAXCSET	((MAXSET+1)*2-1)	/* maximum check set size */
 
-unsigned long  raynum = 0;		/* next unique ray number */
-unsigned long  nrays = 0;		/* number of calls to localhit */
+RNUMBER  raynum = 0;		/* next unique ray number */
+RNUMBER  nrays = 0;		/* number of calls to localhit */
 
 static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
 OBJREC  Lamb = {
 	OVOID, MAT_PLASTIC, "Lambertian",
-	{0, 5, NULL, Lambfa}, NULL,
+	{NULL, Lambfa, 0, 5}, NULL
 };					/* a Lambertian surface */
 
 OBJREC  Aftplane;			/* aft clipping plane object */
@@ -93,11 +93,13 @@ rayorigin(		/* start new ray from old one */
 				colval(ro->cext,RED) : colval(ro->cext,GRN);
 		if (colval(ro->cext,BLU) < re) re = colval(ro->cext,BLU);
 		re *= ro->rot;
-		if (re > 0.1)
-			if (re > 92.)
+		if (re > 0.1) {
+			if (re > 92.) {
 				r->rweight = 0.0;
-			else
+			} else {
 				r->rweight *= exp(-re);
+			}
+		}
 	}
 	rayclear(r);
 	if (r->rweight <= 0.0)			/* check for expiration */
@@ -111,14 +113,14 @@ rayorigin(		/* start new ray from old one */
 			return(-1);		/* upper reflection limit */
 		if (r->rweight >= minweight)
 			return(0);
-		if (frandom() < r->rweight/minweight)
+		if (frandom() > r->rweight/minweight)
 			return(-1);
 		rw = minweight/r->rweight;	/* promote survivor */
 		scalecolor(r->rcoef, rw);
 		r->rweight = minweight;
 		return(0);
 	}
-	return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
+	return(r->rlvl <= abs(maxdepth) && r->rweight >= minweight ? 0 : -1);
 }
 
 
@@ -302,12 +304,14 @@ raymixture(		/* mix modifiers */
 					/* foreground */
 	fr = *r;
 	if (coef > FTINY) {
+		fr.rweight *= coef;
 		scalecolor(fr.rcoef, coef);
 		foremat = rayshade(&fr, fore);
 	}
 					/* background */
 	br = *r;
 	if (coef < 1.0-FTINY) {
+		br.rweight *= 1.0-coef;
 		scalecolor(br.rcoef, 1.0-coef);
 		backmat = rayshade(&br, back);
 	}
@@ -508,8 +512,10 @@ localhit(		/* check for hit in the octree */
 		else if (r->rdir[i] < -1e-7)
 			sflags |= 0x10 << i;
 	}
-	if (sflags == 0)
-		error(CONSISTENCY, "zero ray direction in localhit");
+	if (!sflags) {
+		error(WARNING, "zero ray direction in localhit");
+		return(0);
+	}
 					/* start off assuming nothing hit */
 	if (r->rmax > FTINY) {		/* except aft plane if one */
 		r->ro = &Aftplane;