--- ray/src/rt/mx_func.c	1989/02/02 10:41:29	1.1
+++ ray/src/rt/mx_func.c	2004/03/30 16:13:01	2.8
@@ -1,16 +1,15 @@
-/* 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.8 2004/03/30 16:13:01 schorsch Exp $";
 #endif
-
 /*
  *  mx_func.c - routine for mixture functions.
- *
- *     11/2/88
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
+#include  "func.h"
+#include  "rtotypes.h"
 
 /*
  *	A mixture function is specified:
@@ -27,37 +26,41 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 
-mx_func(m, r)			/* compute mixture function */
-register OBJREC  *m;
-RAY  *r;
+extern int
+mx_func(			/* 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);
 		}
-	if (!vardefined(sa[2]))
-		loadfunc(sa[3]);
+	mf = getfunc(m, 3, 0x4, 0);
+	setfunc(m, r);
 	errno = 0;
-	coef = varvalue(sa[2]);
-	if (errno) {
+	coef = evalue(mf->ep[0]);
+	if (errno == EDOM || errno == ERANGE) {
 		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);
 }