--- ray/src/common/rglinst.c	2003/04/23 02:28:06	3.7
+++ ray/src/common/rglinst.c	2003/11/14 17:22:06	3.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rglinst.c,v 3.7 2003/04/23 02:28:06 greg Exp $";
+static const char	RCSid[] = "$Id: rglinst.c,v 3.13 2003/11/14 17:22:06 schorsch Exp $";
 #endif
 /*
  * Routines for reading instances and converting to OpenGL.
@@ -7,6 +7,13 @@ static const char	RCSid[] = "$Id: rglinst.c,v 3.7 2003
 
 #include "copyright.h"
 
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include "platform.h"
+#include "paths.h"
+#include "resolu.h"
 #include "radogl.h"
 #include "octree.h"
 
@@ -19,13 +26,13 @@ typedef struct {
 	char	octfile[256];			/* octree file path */
 } OCTINST;				/* octree to instantiate */
 
-static double  ogetflt();
-static long  ogetint();
-static char  *ogetstr();
-static int  loadobj();
-static void  skiptree();
-static void  octerror();
-static OCTINST	*getoct();
+static double  ogetflt(void);
+static long  ogetint(int);
+static char  *ogetstr(char *);
+static int  loadobj(void);
+static void  skiptree(void);
+static void  octerror(int etyp, char *msg);
+static OCTINST	*getoct(char *);
 
 static char  *infn;			/* input file name */
 static FILE  *infp;			/* input file stream */
@@ -54,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();
@@ -110,7 +117,7 @@ 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);
 		lu_done(&looptab);
@@ -123,7 +130,6 @@ static OCTINST *
 getoct(name)				/* get/assign octree list id */
 char	*name;
 {
-	extern char	*getpath(), *getlibpath();
 	char	*path;
 	register LUENT	*lp;
 	register OCTINST	*op;
@@ -137,7 +143,7 @@ char	*name;
 		strcpy(lp->key, name);
 	}
 	if ((op = (OCTINST *)lp->data) == NULL) {
-		path = getpath(name, getlibpath(), R_OK);
+		path = getpath(name, getrlibpath(), R_OK);
 		if (path == NULL) {
 			sprintf(errmsg, "cannot find octree \"%s\"", name);
 			error(USER, errmsg);
@@ -151,6 +157,7 @@ char	*name;
 	return(op);
 memerr:
 	error(SYSTEM, "out of memory in getoct");
+	return NULL; /* pro forma return */
 }
 
 
@@ -169,16 +176,14 @@ FVECT	cent;
 		sprintf(errmsg, "cannot open octree file \"%s\"", fname);
 		error(SYSTEM, errmsg);
 	}
-#ifdef MSDOS
-	setmode(fileno(infp), O_BINARY);
-#endif
+	SET_FILE_BINARY(infp);
 					/* get header */
 	if (checkheader(infp, OCTFMT, NULL) < 0)
 		octerror(USER, "not an octree");
 					/* check format */
 	if ((objsize = ogetint(2)-OCTMAGIC) <= 0 ||
 			objsize > MAXOBJSIZ || objsize > sizeof(long))
-		octerror("incompatible octree format");
+		octerror(USER, "incompatible octree format");
 	if (cent != NULL) {		/* get boundaries (compute center) */
 		for (i = 0; i < 3; i++)
 			cent[i] = atof(ogetstr(sbuf));
@@ -208,9 +213,7 @@ char  *fname;
 	
 	infn = fname;
 	infp = fopen(fname, "r");	/* assume already checked */
-#ifdef MSDOS
-	setmode(fileno(infp), O_BINARY);
-#endif
+	SET_FILE_BINARY(infp);
 					/* skip header */
 	getheader(infp, NULL, NULL);
 					/* get format */
@@ -337,7 +340,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)
@@ -359,9 +362,9 @@ loadobj()				/* get next object */
 		ob.oargs.iarg = NULL;
 #endif
 					/* get real arguments */
-	if (ob.oargs.nfargs = ogetint(2)) {
-		ob.oargs.farg = (FLOAT *)malloc
-				(ob.oargs.nfargs*sizeof(FLOAT));
+	if ((ob.oargs.nfargs = ogetint(2))) {
+		ob.oargs.farg = (RREAL *)malloc
+				(ob.oargs.nfargs*sizeof(RREAL));
 		if (ob.oargs.farg == NULL)
 			goto memerr;
 		for (i = 0; i < ob.oargs.nfargs; i++)
@@ -381,6 +384,7 @@ loadobj()				/* get next object */
 	return(nobjects++);		/* return object id */
 memerr:
 	error(SYSTEM, "out of memory in loadobj");
+	return OVOID; /* pro forma return */
 }