--- ray/src/hd/clumpbeams.c	2003/06/20 00:25:49	3.4
+++ ray/src/hd/clumpbeams.c	2003/07/27 22:12:02	3.6
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: clumpbeams.c,v 3.4 2003/06/20 00:25:49 greg Exp $";
+static const char	RCSid[] = "$Id: clumpbeams.c,v 3.6 2003/07/27 22:12:02 schorsch Exp $";
 #endif
 /*
  * Bundle holodeck beams together into clumps.
@@ -52,10 +52,10 @@ GCOORD	*gc;
 	register int	i, j;
 
 	for (i = 3; i--; ) {
-		copystruct(&gci0, gc);
+		gci0 = *gc;
 		gcshifti(&gci0, 0, i-1, hp);
 		for (j = 3; j--; ) {
-			copystruct(ng+(3*i+j), &gci0);
+			*(ng+(3*i+j)) = gci0;
 			gcshifti(ng+(3*i+j), gci0.w==gc->w, j-1, hp);
 		}
 	}
@@ -76,12 +76,12 @@ int	b;
 	bneighrem = 0;
 	for (i = 9; i--; )
 		for (j = 9; j--; ) {
-			if (i == 4 & j == 4)	/* don't copy starting beam */
+			if ((i == 4) & (j == 4))	/* don't copy starting beam */
 				continue;
 			if (wg0[i].w == wg1[j].w)
 				continue;
-			copystruct(bgc, wg0+i);
-			copystruct(bgc+1, wg1+j);
+			*bgc = *(wg0+i);
+			*(bgc+1) = *(wg1+j);
 			bneighlist[bneighrem++] = hdbindex(hp, bgc);
 #ifdef DEBUG
 			if (bneighlist[bneighrem-1] <= 0)
@@ -112,7 +112,7 @@ int	(*cf)();
 	bqueue = (int *)malloc(maxcnt*sizeof(int));
 	bflags = (uint32 *)calloc((nbeams(hp)>>5)+1,
 			sizeof(uint32));
-	if (bqueue == NULL | bflags == NULL)
+	if ((bqueue == NULL) | (bflags == NULL))
 		error(SYSTEM, "out of memory in clumpbeams");
 					/* mark empty beams as done */
 	for (i = nbeams(hp); i > 0; i--)