--- ray/src/rt/mx_func.c	1991/11/12 17:08:33	2.1
+++ ray/src/rt/mx_func.c	2003/02/25 02:47:22	2.6
@@ -1,17 +1,16 @@
-/* Copyright (c) 1988 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: mx_func.c,v 2.6 2003/02/25 02:47:22 greg Exp $";
 #endif
-
 /*
  *  mx_func.c - routine for mixture functions.
- *
- *     11/2/88
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
+#include  "func.h"
+
 /*
  *	A mixture function is specified:
  *
@@ -31,32 +30,35 @@ mx_func(m, r)			/* compute mixture function */
 register OBJREC  *m;
 RAY  *r;
 {
-	extern double  varvalue();
-	extern int  errno;
+	OBJECT	obj;
 	register int  i;
 	double  coef;
 	OBJECT  mod[2];
-	register char  **sa;
+	register MFUNC  *mf;
 
-	setfunc(m, r);
-
-	sa = m->oargs.sarg;
-
 	if (m->oargs.nsargs < 4)
 		objerror(m, USER, "bad # arguments");
+	obj = objndx(m);
 	for (i = 0; i < 2; i++)
-		if (!strcmp(sa[i], VOIDID))
+		if (!strcmp(m->oargs.sarg[i], VOIDID))
 			mod[i] = OVOID;
-		else if ((mod[i] = modifier(sa[i])) == OVOID) {
-			sprintf(errmsg, "undefined modifier \"%s\"", sa[i]);
+		else if ((mod[i] = lastmod(obj, m->oargs.sarg[i])) == OVOID) {
+			sprintf(errmsg, "undefined modifier \"%s\"",
+					m->oargs.sarg[i]);
 			objerror(m, USER, errmsg);
 		}
-	funcfile(sa[3]);
+	mf = getfunc(m, 3, 0x4, 0);
+	setfunc(m, r);
 	errno = 0;
-	coef = varvalue(sa[2]);
+	coef = evalue(mf->ep[0]);
 	if (errno) {
 		objerror(m, WARNING, "compute error");
-		return;
+		return(0);
 	}
-	raymixture(r, mod[0], mod[1], coef);
+	if (raymixture(r, mod[0], mod[1], coef)) {
+		if (m->omod != OVOID)
+			objerror(m, USER, "inappropriate modifier");
+		return(1);
+	}
+	return(0);
 }