--- ray/src/hd/rhd_geom.c	2003/05/13 17:58:33	3.10
+++ ray/src/hd/rhd_geom.c	2003/07/21 22:30:18	3.13
@@ -1,10 +1,12 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhd_geom.c,v 3.10 2003/05/13 17:58:33 greg Exp $";
+static const char	RCSid[] = "$Id: rhd_geom.c,v 3.13 2003/07/21 22:30:18 schorsch Exp $";
 #endif
 /*
  * Geometry drawing operations for OpenGL driver.
  */
 
+#include <string.h>
+
 #include "radogl.h"
 #include "rhdriver.h"
 
@@ -23,7 +25,7 @@ static char	*newportlist[MAXPORT];	/* new portal file 
 static struct gmEntry {
 	char	*gfile;			/* geometry file name */
 	FVECT	cent;			/* centroid */
-	FLOAT	rad;			/* radius */
+	RREAL	rad;			/* radius */
 	int	listid;			/* display list identifier */
 	int	nlists;			/* number of lists allocated */
 } gmCurrent[MAXGEO], gmNext[MAXGEO];	/* current and next list */
@@ -50,7 +52,7 @@ char	*file;
 					/* check if copy in current list */
 	FORALLGEOM(gmCurrent, j)
 		if (!strcmp(file, gmCurrent[j].gfile)) {
-			copystruct(&gmNext[i], &gmCurrent[j]);
+			gmNext[i] = gmCurrent[j];
 			return;
 		}
 					/* else load new octree */
@@ -81,8 +83,8 @@ gmEndGeom()			/* make next list current */
 			freestr(gmCurrent[i].gfile);
 		}
 	}
-	bcopy((void *)gmNext, (void *)gmCurrent, sizeof(gmNext));
-	bzero((void *)gmNext, sizeof(gmNext));
+	memcpy((void *)gmCurrent, (void *)gmNext, sizeof(gmNext));
+	memset((void *)gmNext, '\0', sizeof(gmNext));
 }
 
 
@@ -196,7 +198,7 @@ gmEndPortal()			/* close portal list and return GL lis
 		}
 	FORALLPORT(curportlist, n)		/* free old file list */
 		freestr(curportlist[n]);
-	bcopy((void *)newportlist, (void *)curportlist, sizeof(newportlist));
-	bzero((void *)newportlist, sizeof(newportlist));
+	memcpy((void *)curportlist, (void *)newportlist, sizeof(newportlist));
+	memset((void *)newportlist, '\0', sizeof(newportlist));
 	return(gmPortals);			/* return GL list id */
 }