--- ray/src/rt/m_mirror.c	2014/01/25 18:27:39	2.15
+++ ray/src/rt/m_mirror.c	2023/11/15 18:02:53	2.23
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: m_mirror.c,v 2.15 2014/01/25 18:27:39 greg Exp $";
+static const char	RCSid[] = "$Id: m_mirror.c,v 2.23 2023/11/15 18:02:53 greg Exp $";
 #endif
 /*
  * Routines for mirror material supporting virtual light sources
@@ -29,23 +29,24 @@ static void mirrorproj(MAT4  m, FVECT  nv, double  off
 VSMATERIAL  mirror_vs = {mir_proj, 1};
 
 
-extern int
+int
 m_mirror(			/* shade mirrored ray */
-	register OBJREC  *m,
-	register RAY  *r
+	OBJREC  *m,
+	RAY  *r
 )
 {
-	COLOR  mcolor;
+	SCOLOR  mcolor;
 	RAY  nr;
 	int  rpure = 1;
-	register int  i;
+	int  i;
 					/* check arguments */
 	if (m->oargs.nfargs != 3 || m->oargs.nsargs > 1)
 		objerror(m, USER, "bad number of arguments");
 					/* check for substitute material */
 					/* but avoid double-counting */
-	if (m->oargs.nsargs > 0 && !(r->crtype & (AMBIENT|SPECULAR)) &&
-			(r->rsrc < 0 || source[r->rsrc].so != r->ro)) {
+	if ( m->oargs.nsargs > 0 &&
+			(r->rsrc < 0 || source[r->rsrc].so != r->ro) &&
+			!(r->crtype & (AMBIENT|SPECULAR) && r->rod > 0.) ) {
 		if (!strcmp(m->oargs.sarg[0], VOIDID)) {
 			raytrans(r);
 			return(1);
@@ -64,10 +65,10 @@ m_mirror(			/* shade mirrored ray */
 					/* get modifiers */
 	raytexture(r, m->omod);
 					/* assign material color */
-	setcolor(mcolor, m->oargs.farg[0],
+	setscolor(mcolor, m->oargs.farg[0],
 			m->oargs.farg[1],
 			m->oargs.farg[2]);
-	multcolor(mcolor, r->pcol);
+	smultscolor(mcolor, r->pcol);
 					/* compute reflected ray */
 	if (r->rsrc >= 0) {			/* relayed light source */
 		rayorigin(&nr, REFLECTED, r, mcolor);
@@ -82,7 +83,8 @@ m_mirror(			/* shade mirrored ray */
 
 		if (rayorigin(&nr, REFLECTED, r, mcolor) < 0)
 			return(1);
-		if (DOT(r->pert,r->pert) > FTINY*FTINY) {
+		if (!(r->crtype & AMBIENT) &&
+				DOT(r->pert,r->pert) > FTINY*FTINY) {
 			pdot = raynormal(pnorm, r);	/* use textures */
 			for (i = 0; i < 3; i++)
 				nr.rdir[i] = r->rdir[i] + 2.*pdot*pnorm[i];
@@ -95,10 +97,12 @@ m_mirror(			/* shade mirrored ray */
 	}
 	checknorm(nr.rdir);
 	rayvalue(&nr);
-	multcolor(nr.rcol, nr.rcoef);
-	addcolor(r->rcol, nr.rcol);
+	smultscolor(nr.rcol, nr.rcoef);
+	copyscolor(r->mcol, nr.rcol);
+	saddscolor(r->rcol, nr.rcol);
+	r->rmt = r->rot;
 	if (rpure && r->ro != NULL && isflat(r->ro->otype))
-		r->rt = r->rot + nr.rt;
+		r->rmt += raydistance(&nr);
 	return(1);
 }
 
@@ -106,7 +110,7 @@ m_mirror(			/* shade mirrored ray */
 static int
 mir_proj(		/* compute a mirror's projection */
 	MAT4  pm,
-	register OBJREC  *o,
+	OBJREC  *o,
 	SRCREC  *s,
 	int  n
 )
@@ -142,12 +146,12 @@ mir_proj(		/* compute a mirror's projection */
 
 static void
 mirrorproj(		/* get mirror projection for surface */
-	register MAT4  m,
+	MAT4  m,
 	FVECT  nv,
 	double  offs
 )
 {
-	register int  i, j;
+	int  i, j;
 					/* assign matrix */
 	setident4(m);
 	for (j = 0; j < 3; j++) {