--- ray/src/hd/rhdisp.c	2003/05/13 17:58:33	3.45
+++ ray/src/hd/rhdisp.c	2003/07/27 22:12:02	3.49
@@ -1,15 +1,17 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhdisp.c,v 3.45 2003/05/13 17:58:33 greg Exp $";
+static const char	RCSid[] = "$Id: rhdisp.c,v 3.49 2003/07/27 22:12:02 schorsch Exp $";
 #endif
 /*
  * Holodeck display process.
  */
 
+#include <string.h>
+#include <ctype.h>
+
 #include "rholo.h"
 #include "rhdisp.h"
 #include "rhdriver.h"
 #include "selcall.h"
-#include <ctype.h>
 
 #ifndef VIEWHISTLEN
 #define VIEWHISTLEN	4	/* number of remembered views */
@@ -216,14 +218,14 @@ char	*gfn, *pfn;
 	hdlist[hd] = (HOLO *)malloc(sizeof(HOLO));
 	if (hdlist[hd] == NULL)
 		error(SYSTEM, "out of memory in add_holo");
-	bcopy((void *)hdg, (void *)hdlist[hd], sizeof(HDGRID));
+	memcpy((void *)hdlist[hd], (void *)hdg, sizeof(HDGRID));
 	hdcompgrid(hdlist[hd]);
 	hdgfn[hd] = savestr(gfn);
 	hdpfn[hd] = pfn && *pfn ? savestr(pfn) : (char *)NULL;
 	if (hd)
 		return;
 					/* set initial viewpoint */
-	copystruct(&nv, &odev.v);
+	nv = odev.v;
 	VSUM(nv.vp, hdlist[0]->orig, hdlist[0]->xv[0], 0.5);
 	VSUM(nv.vp, nv.vp, hdlist[0]->xv[1], 0.5);
 	VSUM(nv.vp, nv.vp, hdlist[0]->xv[2], 0.5);
@@ -247,7 +249,7 @@ register PACKHEAD	*p;
 	double	d;
 	register int	i;
 					/* get beam coordinates */
-	if (p->hd < 0 | p->hd >= HDMAX || hdlist[p->hd] == NULL)
+	if ((p->hd < 0) | (p->hd >= HDMAX) || hdlist[p->hd] == NULL)
 		error(INTERNAL, "bad holodeck number in disp_bundle");
 	if (!hdbcoord(gc, hdlist[p->hd], p->bi))
 		error(INTERNAL, "bad beam index in disp_bundle");
@@ -275,7 +277,7 @@ register VIEW	*v;
 	static unsigned	nhist;
 	VIEW	*dv;
 	int	i, res[2];
-	int2	*slist;
+	int16	*slist;
 	char	*err;
 				/* restore previous view? */
 	if (v == NULL) {
@@ -304,7 +306,7 @@ again:
 				error(COMMAND, "invalid starting view");
 				return;
 			}
-			copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN));
+			*v = *(viewhist + ((nhist-1)%VIEWHISTLEN));
 			goto again;	/* poss. overloading dev_section()? */
 		}
 		DCHECK(*slist < 0, WARNING, "no visible sections in new_view");
@@ -317,7 +319,7 @@ again:
 	imm_mode = beam_sync(odev.firstuse) > 0;
 				/* record new view */
 	if (v < viewhist || v >= viewhist+VIEWHISTLEN) {
-		copystruct(viewhist + (nhist%VIEWHISTLEN), v);
+		*(viewhist + (nhist%VIEWHISTLEN)) = *v;
 		nhist++;
 	}
 }
@@ -347,7 +349,7 @@ char	*args;
 	beam_init(0);					/* add basic views */
 	for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++)
 		beam_view(dv, res[0]>>4, res[1]>>4);
-	copystruct(&vwfocus, &odev.v);			/* add focus view */
+	vwfocus = odev.v;			/* add focus view */
 	switch (odev.v.type) {
 	case VT_PER:
 		vwfocus.horiz = 2.*180./PI*atan(
@@ -413,7 +415,7 @@ usr_input()			/* get user input and process it */
 	}
 	switch (i) {
 	case DC_SETVIEW:		/* set the view */
-		copystruct(&vparams, &odev.v);
+		vparams = odev.v;
 		if (!sscanview(&vparams, args))
 			error(COMMAND, "missing view options");
 		else