--- ray/src/common/rglinst.c	2003/07/12 09:55:13	3.11
+++ ray/src/common/rglinst.c	2004/05/25 22:04:13	3.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rglinst.c,v 3.11 2003/07/12 09:55:13 schorsch Exp $";
+static const char	RCSid[] = "$Id: rglinst.c,v 3.15 2004/05/25 22:04:13 greg Exp $";
 #endif
 /*
  * Routines for reading instances and converting to OpenGL.
@@ -12,6 +12,7 @@ static const char	RCSid[] = "$Id: rglinst.c,v 3.11 200
 #include <time.h>
 
 #include "platform.h"
+#include "paths.h"
 #include "resolu.h"
 #include "radogl.h"
 #include "octree.h"
@@ -60,7 +61,7 @@ register OBJREC	*o;
 				o->oargs.nsargs-1)
 			objerror(o, USER, "bad transform");
 		glPushAttrib(GL_TRANSFORM_BIT);
-		if (xfs.sca < 1.-FTINY | xfs.sca > 1.+FTINY)
+		if ((xfs.sca < 1.-FTINY) | (xfs.sca > 1.+FTINY))
 			glEnable(GL_NORMALIZE);
 		glMatrixMode(GL_MODELVIEW);
 		glPushMatrix();
@@ -88,8 +89,9 @@ register OBJREC	*o;
 
 
 static int
-buildoctlist(lp)			/* build octree list */
-LUENT	*lp;
+buildoctlist(lp, p)			/* build octree list */
+const LUENT	*lp;
+void	*p;
 {
 	int	old_dolights = dolights, old_domats = domats;
 	register OCTINST	*op = (OCTINST *)lp->data;
@@ -116,9 +118,9 @@ loadoctrees()				/* load octrees we've saved up */
 	while (ottab.tsiz) {
 		if (!levelsleft--)
 			error(USER, "too many octree levels -- instance loop?");
-		copystruct(&looptab, &ottab);
+		looptab = ottab;
 		ottab.tsiz = 0;
-		nocts += lu_doall(&looptab, buildoctlist);
+		nocts += lu_doall(&looptab, buildoctlist, NULL);
 		lu_done(&looptab);
 	}
 	return(nocts);
@@ -156,6 +158,7 @@ char	*name;
 	return(op);
 memerr:
 	error(SYSTEM, "out of memory in getoct");
+	return NULL; /* pro forma return */
 }
 
 
@@ -338,7 +341,7 @@ loadobj()				/* get next object */
 					/* get name id */
 	ob.oname = ogetstr(idbuf);
 					/* get string arguments */
-	if (ob.oargs.nsargs = ogetint(2)) {
+	if ((ob.oargs.nsargs = ogetint(2))) {
 		ob.oargs.sarg = (char **)malloc
 				(ob.oargs.nsargs*sizeof(char *));
 		if (ob.oargs.sarg == NULL)
@@ -360,7 +363,7 @@ loadobj()				/* get next object */
 		ob.oargs.iarg = NULL;
 #endif
 					/* get real arguments */
-	if (ob.oargs.nfargs = ogetint(2)) {
+	if ((ob.oargs.nfargs = ogetint(2))) {
 		ob.oargs.farg = (RREAL *)malloc
 				(ob.oargs.nfargs*sizeof(RREAL));
 		if (ob.oargs.farg == NULL)
@@ -382,6 +385,7 @@ loadobj()				/* get next object */
 	return(nobjects++);		/* return object id */
 memerr:
 	error(SYSTEM, "out of memory in loadobj");
+	return OVOID; /* pro forma return */
 }