--- ray/src/rt/m_direct.c	2005/04/19 01:15:06	2.13
+++ ray/src/rt/m_direct.c	2023/11/15 18:02:53	2.17
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: m_direct.c,v 2.13 2005/04/19 01:15:06 greg Exp $";
+static const char	RCSid[] = "$Id: m_direct.c,v 2.17 2023/11/15 18:02:53 greg Exp $";
 #endif
 /*
  * Routines for light-redirecting materials and
@@ -39,10 +39,10 @@ VSMATERIAL  direct2_vs = {dir_proj, 2};
 				getfunc(m, 8, 0xff, 1) )
 
 
-extern int
+int
 m_direct(			/* shade redirected ray */
-	register OBJREC  *m,
-	register RAY  *r
+	OBJREC  *m,
+	RAY  *r
 )
 {
 					/* check if source ray */
@@ -68,17 +68,17 @@ redirect(		/* compute n'th ray redirection */
 )
 {
 	MFUNC  *mf;
-	register EPNODE  **va;
+	EPNODE  **va;
 	FVECT  nsdir;
 	RAY  nr;
 	double  coef;
-	register int  j;
+	int  j;
 					/* set up function */
 	mf = getdfunc(m);
 	setfunc(m, r);
 					/* assign direction variable */
 	if (r->rsrc >= 0) {
-		register SRCREC  *sp = source + source[r->rsrc].sa.sv.sn;
+		SRCREC  *sp = source + source[r->rsrc].sa.sv.sn;
 
 		if (sp->sflags & SDISTANT)
 			VCOPY(nsdir, sp->sloc);
@@ -102,7 +102,7 @@ redirect(		/* compute n'th ray redirection */
 	coef = evalue(va[0]);
 	if ((errno == EDOM) | (errno == ERANGE))
 		goto computerr;
-	setcolor(nr.rcoef, coef, coef, coef);
+	setscolor(nr.rcoef, coef, coef, coef);
 	if (rayorigin(&nr, TRANS, r, nr.rcoef) < 0)
 		return(0);
 	va++;				/* compute direction */
@@ -111,8 +111,8 @@ redirect(		/* compute n'th ray redirection */
 		if (errno == EDOM || errno == ERANGE)
 			goto computerr;
 	}
-	if (mf->f != &unitxf)
-		multv3(nr.rdir, nr.rdir, mf->f->xfm);
+	if (mf->fxp != &unitxf)
+		multv3(nr.rdir, nr.rdir, mf->fxp->xfm);
 	if (r->rox != NULL)
 		multv3(nr.rdir, nr.rdir, r->rox->f.xfm);
 	if (normalize(nr.rdir) == 0.0)
@@ -121,10 +121,10 @@ redirect(		/* compute n'th ray redirection */
 	if (r->rsrc >= 0)
 		nr.rsrc = source[r->rsrc].sa.sv.sn;
 	rayvalue(&nr);
-	multcolor(nr.rcol, nr.rcoef);
-	addcolor(r->rcol, nr.rcol);
+	smultscolor(nr.rcol, nr.rcoef);
+	saddscolor(r->rcol, nr.rcol);
 	if (r->ro != NULL && isflat(r->ro->otype))
-		r->rt = r->rot + nr.rt;
+		r->rxt = r->rot + raydistance(&nr);
 	return(1);
 computerr:
 	objerror(m, WARNING, "compute error");
@@ -146,7 +146,7 @@ dir_proj(		/* compute a director's projection */
 	EPNODE  **va;
 	FVECT  cent, newdir, nv, h;
 	double  coef, olddot, newdot, od;
-	register int  i, j;
+	int  i, j;
 				/* initialize test ray */
 	getmaxdisk(cent, o);
 	if (s->sflags & SDISTANT)
@@ -190,8 +190,8 @@ dir_proj(		/* compute a director's projection */
 		if (errno == EDOM || errno == ERANGE)
 			goto computerr;
 	}
-	if (mf->f != &unitxf)
-		multv3(newdir, newdir, mf->f->xfm);
+	if (mf->fxp != &unitxf)
+		multv3(newdir, newdir, mf->fxp->xfm);
 					/* normalization unnecessary */
 	newdot = DOT(newdir, nv);
 	if (newdot <= FTINY && newdot >= -FTINY)