--- ray/src/hd/holo.c	1999/03/12 09:37:47	3.16
+++ ray/src/hd/holo.c	2003/07/21 22:30:18	3.19
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: holo.c,v 3.19 2003/07/21 22:30:18 schorsch Exp $";
 #endif
-
 /*
  * Routines for converting holodeck coordinates, etc.
  *
@@ -93,9 +90,9 @@ register int	i;
 	gc[1].i[1] = i / hp->grid[hdwg0[gc[1].w]];
 	gc[1].i[0] = i - gc[1].i[1]*hp->grid[hdwg0[gc[1].w]];
 	if (reverse) {
-		copystruct(g2, gc+1);
-		copystruct(gc+1, gc);
-		copystruct(gc, g2);
+		*g2 = *(gc+1);
+		*(gc+1) = *gc;
+		*gc = *g2;
 	}
 	return(1);			/* we're done */
 }
@@ -111,8 +108,8 @@ register GCOORD	gc[2];
 	register int	i, j;
 					/* check ordering and limits */
 	if (reverse = gc[0].w > gc[1].w) {
-		copystruct(g2, gc+1);
-		copystruct(g2+1, gc);
+		*g2 = *(gc+1);
+		*(g2+1) = *gc;
 		gc = g2;
 	} else if (gc[0].w == gc[1].w)
 		return(0);
@@ -137,7 +134,7 @@ register FVECT	cp[4];	/* returned (may be passed as FV
 register HOLO	*hp;
 register GCOORD	*gc;
 {
-	register FLOAT	*v;
+	register RREAL	*v;
 	double	d;
 					/* compute common component */
 	VCOPY(cp[0], hp->orig);
@@ -266,7 +263,7 @@ FVECT	ro, rd;		/* normalization of rd affects distance
 {
 	FVECT	p[2], vt;
 	double	d, t0, t1, d0, d1;
-	register FLOAT	*v;
+	register RREAL	*v;
 	register int	i;
 					/* first, intersect walls */
 	gc[0].w = gc[1].w = -1;