--- ray/src/hd/rholo2.c	2003/02/22 02:07:25	3.22
+++ ray/src/hd/rholo2.c	2003/07/27 22:12:02	3.27
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rholo2.c,v 3.22 2003/02/22 02:07:25 greg Exp $";
+static const char	RCSid[] = "$Id: rholo2.c,v 3.27 2003/07/27 22:12:02 schorsch Exp $";
 #endif
 /*
  * Rtrace support routines for holodeck rendering
@@ -27,7 +27,7 @@ register struct gclim	*gcl;
 register HOLO	*hp;
 GCOORD	*gc;
 {
-	register FLOAT	*v;
+	register RREAL	*v;
 	register int	i;
 
 	if (hp != NULL) {
@@ -38,7 +38,7 @@ GCOORD	*gc;
 		gcl->erg2 *= (1./3.) * myeye.rng*myeye.rng;
 	}
 	if (gc != NULL)
-		copystruct(&gcl->gc, gc);
+		gcl->gc = *gc;
 	gcl->gmin[0] = gcl->gmin[1] = FHUGE;
 	gcl->gmax[0] = gcl->gmax[1] = -FHUGE;
 }
@@ -106,7 +106,7 @@ int	tight;
 				d*(c*d-b*e) + f*b*b);
 		while (n-- > 0) {
 			if (gc->w>>1 == gi[i] &&
-					(gc->w&1) ^ root[n] < gp[gc->w>>1]) {
+					(gc->w&1) ^ (root[n] < gp[gc->w>>1])) {
 				if (gc->w&1)
 					gcl->gmin[i] = -FHUGE;
 				else
@@ -132,7 +132,7 @@ int	tight;
 			n = quadratic(root, a, b*yex+d, yex*(yex*c+e)+f);
 			while (n-- > 0) {
 				if (gc->w>>1 == gi[i] &&
-					(gc->w&1) ^ root[n] < gp[gc->w>>1])
+					(gc->w&1) ^ (root[n] < gp[gc->w>>1]))
 					continue;
 				if (root[n] < gcl->gmin[i])
 					gcl->gmin[i] = root[n];
@@ -277,7 +277,7 @@ done_rtrace()			/* clean up and close rtrace calculati
 	int	status;
 					/* already closed? */
 	if (!nprocs)
-		return;
+		return(0);
 					/* flush beam queue */
 	done_packets(flush_queue());
 					/* sync holodeck */
@@ -348,7 +348,7 @@ getradfile()			/* run rad and get needed variables */
 			pippt = NULL;
 		}
 	if (pippt != NULL)
-		strcpy(pippt, "> /dev/null");	/* nothing to match */
+		strcpy(pippt, "> " NULL_DEVICE);	/* nothing to match */
 	else
 		sprintf(cp, ")[ \t]*=' > %s", tf2);
 #ifdef DEBUG