--- ray/src/hd/clumpbeams.c	2003/02/22 02:07:24	3.3
+++ ray/src/hd/clumpbeams.c	2003/07/21 22:30:18	3.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: clumpbeams.c,v 3.3 2003/02/22 02:07:24 greg Exp $";
+static const char	RCSid[] = "$Id: clumpbeams.c,v 3.5 2003/07/21 22:30:18 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);
 		}
 	}
@@ -80,8 +80,8 @@ int	b;
 				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)
@@ -98,10 +98,10 @@ int	maxcnt, maxsiz;
 int	(*cf)();
 {
 	static short	primes[] = {9431,6803,4177,2659,1609,887,587,251,47,1};
-	unsigned int4	*bflags;
+	uint32	*bflags;
 	int	*bqueue;
 	int	bqlen;
-	int4	bqtotal;
+	int32	bqtotal;
 	int	bc, bci, bqc, myprime;
 	register int	i;
 					/* get clump size */
@@ -110,8 +110,8 @@ int	(*cf)();
 	maxsiz /= sizeof(RAYVAL);
 					/* allocate beam queue */
 	bqueue = (int *)malloc(maxcnt*sizeof(int));
-	bflags = (unsigned int4 *)calloc((nbeams(hp)>>5)+1,
-			sizeof(unsigned int4));
+	bflags = (uint32 *)calloc((nbeams(hp)>>5)+1,
+			sizeof(uint32));
 	if (bqueue == NULL | bflags == NULL)
 		error(SYSTEM, "out of memory in clumpbeams");
 					/* mark empty beams as done */