--- ray/src/rt/func.c	2003/03/11 17:08:55	2.16
+++ ray/src/rt/func.c	2004/03/30 16:13:01	2.22
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: func.c,v 2.16 2003/03/11 17:08:55 greg Exp $";
+static const char	RCSid[] = "$Id: func.c,v 2.22 2004/03/30 16:13:01 schorsch Exp $";
 #endif
 /*
  *  func.c - interface to calcomp functions.
@@ -7,10 +7,11 @@ static const char	RCSid[] = "$Id: func.c,v 2.16 2003/0
 
 #include "copyright.h"
 
-#include  "ray.h"
+#include <math.h>
 
+#include  "ray.h"
+#include  "paths.h"
 #include  "otypes.h"
-
 #include  "func.h"
 
 
@@ -31,15 +32,16 @@ XF  funcxf;			/* current transformation */
 static OBJREC  *fobj = NULL;	/* current function object */
 static RAY  *fray = NULL;	/* current function ray */
 
-static double  l_erf(), l_erfc(), l_arg();
+static double  l_erf(char *), l_erfc(char *), l_arg(char *);
 
 
-MFUNC *
-getfunc(m, ff, ef, dofwd)	/* get function for this modifier */
-OBJREC  *m;
-int  ff;
-unsigned int  ef;
-int  dofwd;
+extern MFUNC *
+getfunc(	/* get function for this modifier */
+	OBJREC  *m,
+	int  ff,
+	unsigned int  ef,
+	int  dofwd
+)
 {
 	static char  initfile[] = INITFILE;
 	char  sbuf[MAXSTR];
@@ -63,7 +65,7 @@ int  dofwd;
 		scompile("Ix=$16;Iy=$17;Iz=$18;", NULL, 0);
 		scompile("Jx=$19;Jy=$20;Jz=$21;", NULL, 0);
 		scompile("Kx=$22;Ky=$23;Kz=$24;", NULL, 0);
-		scompile("Lu=$25;Lv=$26;", NULL, 0);
+		scompile("Lu=$26;Lv=$27;", NULL, 0);
 		funset("arg", 1, '=', l_arg);
 		funset("erf", 1, ':', l_erf);
 		funset("erfc", 1, ':', l_erfc);
@@ -131,12 +133,14 @@ toofew:
 	objerror(m, USER, "too few string arguments");
 memerr:
 	error(SYSTEM, "out of memory in getfunc");
+	return NULL; /* pro forma return */
 }
 
 
-void
-freefunc(m)			/* free memory associated with modifier */
-OBJREC  *m;
+extern void
+freefunc(			/* free memory associated with modifier */
+	OBJREC  *m
+)
 {
 	register MFUNC  *f;
 	register int  i;
@@ -163,10 +167,11 @@ OBJREC  *m;
 }
 
 
-int
-setfunc(m, r)			/* set channels for function call */
-OBJREC  *m;
-register RAY  *r;
+extern int
+setfunc(			/* set channels for function call */
+	OBJREC  *m,
+	register RAY  *r
+)
 {
 	static unsigned long  lastrno = ~0;
 	register MFUNC  *f;
@@ -185,22 +190,23 @@ register RAY  *r;
 			funcxf.sca = r->rox->b.sca * f->b->sca;
 			multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
 		} else
-			copystruct(&funcxf, &r->rox->b);
+			funcxf = r->rox->b;
 	else
-		copystruct(&funcxf, f->b);
+		funcxf = *(f->b);
 	lastrno = r->rno;
 	eclock++;		/* notify expression evaluator */
 	return(1);
 }
 
 
-void
-loadfunc(fname)			/* load definition file */
-char  *fname;
+extern void
+loadfunc(			/* load definition file */
+	char  *fname
+)
 {
 	char  *ffname;
 
-	if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
+	if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find function file \"%s\"", fname);
 		error(USER, errmsg);
 	}
@@ -209,7 +215,7 @@ char  *fname;
 
 
 static double
-l_arg()				/* return nth real argument */
+l_arg(char *nm)			/* return nth real argument */
 {
 	register int  n;
 
@@ -230,26 +236,23 @@ l_arg()				/* return nth real argument */
 
 
 static double
-l_erf()				/* error function */
+l_erf(char *nm)			/* error function */
 {
-	extern double  erf();
-
 	return(erf(argument(1)));
 }
 
 
 static double
-l_erfc()			/* cumulative error function */
+l_erfc(char *nm)		/* cumulative error function */
 {
-	extern double  erfc();
-
 	return(erfc(argument(1)));
 }
 
 
-double
-chanvalue(n)			/* return channel n to calcomp */
-register int  n;
+extern double
+chanvalue(			/* return channel n to calcomp */
+	register int  n
+)
 {
 	if (fray == NULL)
 		syntax("ray parameter used in constant expression");
@@ -257,21 +260,21 @@ register int  n;
 	if (--n < 0)
 		goto badchan;
 
-	if (n < 3)			/* ray direction */
+	if (n <= 2)			/* ray direction */
 
 		return( (	fray->rdir[0]*funcxf.xfm[0][n] +
 				fray->rdir[1]*funcxf.xfm[1][n] +
 				fray->rdir[2]*funcxf.xfm[2][n]	)
 			 / funcxf.sca );
 
-	if (n < 6)			/* surface normal */
+	if (n <= 5)			/* surface normal */
 
 		return( (	fray->ron[0]*funcxf.xfm[0][n-3] +
 				fray->ron[1]*funcxf.xfm[1][n-3] +
 				fray->ron[2]*funcxf.xfm[2][n-3]	)
 			 / funcxf.sca );
 
-	if (n < 9)			/* intersection */
+	if (n <= 8)			/* intersection */
 
 		return( fray->rop[0]*funcxf.xfm[0][n-6] +
 				fray->rop[1]*funcxf.xfm[1][n-6] +
@@ -289,23 +292,23 @@ register int  n;
 	if (n == 11)			/* scale */
 		return(funcxf.sca);
 
-	if (n < 15)			/* origin */
+	if (n <= 14)			/* origin */
 		return(funcxf.xfm[3][n-12]);
 
-	if (n < 18)			/* i unit vector */
+	if (n <= 17)			/* i unit vector */
 		return(funcxf.xfm[0][n-15] / funcxf.sca);
 
-	if (n < 21)			/* j unit vector */
-		return(funcxf.xfm[1][n-15] / funcxf.sca);
+	if (n <= 20)			/* j unit vector */
+		return(funcxf.xfm[1][n-18] / funcxf.sca);
 
-	if (n < 24)			/* k unit vector */
+	if (n <= 23)			/* k unit vector */
 		return(funcxf.xfm[2][n-21] / funcxf.sca);
 
-	if (n < 25)			/* single ray (shadow) distance */
+	if (n == 24)			/* single ray (shadow) distance */
 		return((fray->rot+raydist(fray->parent,SHADOW)) * funcxf.sca);
 
-	if (n < 27)			/* local (u,v) coordinates */
-		return(fray->uv[n-26]);
+	if (n <= 26)			/* local (u,v) coordinates */
+		return(fray->uv[n-25]);
 badchan:
 	error(USER, "illegal channel number");
 	return(0.0);