--- ray/src/hd/rhdisp2.c	2003/02/22 02:07:24	3.33
+++ ray/src/hd/rhdisp2.c	2003/07/27 22:12:02	3.36
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhdisp2.c,v 3.33 2003/02/22 02:07:24 greg Exp $";
+static const char	RCSid[] = "$Id: rhdisp2.c,v 3.36 2003/07/27 22:12:02 schorsch Exp $";
 #endif
 /*
  * Holodeck beam tracking for display process
@@ -34,7 +34,7 @@ newcbeam()		/* allocate new entry at end of cbeam arra
 			cbeam = (PACKHEAD *)malloc(
 					maxcbeam*sizeof(PACKHEAD) );
 		else
-			cbeam = (PACKHEAD *)realloc( (char *)cbeam,
+			cbeam = (PACKHEAD *)realloc((void *)cbeam,
 					maxcbeam*sizeof(PACKHEAD) );
 		if (cbeam == NULL)
 			error(SYSTEM, "out of memory in newcbeam");
@@ -103,9 +103,9 @@ int	bi;
 		if (cbeam[n].bi == bi && cbeam[n].hd == hd)
 			return(n);
 				/* check legality */
-	if (hd < 0 | hd >= HDMAX || hdlist[hd] == NULL)
+	if ((hd < 0) | (hd >= HDMAX) || hdlist[hd] == NULL)
 		error(INTERNAL, "illegal holodeck number in getcbeam");
-	if (bi < 1 | bi > nbeams(hdlist[hd]))
+	if ((bi < 1) | (bi > nbeams(hdlist[hd])))
 		error(INTERNAL, "illegal beam index in getcbeam");
 	n = newcbeam();		/* allocate and assign */
 	cbeam[n].hd = hd; cbeam[n].bi = bi; cbeam[n].nr = cbeam[n].nc = 0;
@@ -147,12 +147,12 @@ int	fresh;
 }
 
 
-int2 *
+int16 *
 beam_view(vn, hr, vr)		/* add beam view (if advisable) */
 VIEW	*vn;
 int	hr, vr;
 {
-	int2	*slist;
+	int16	*slist;
 	BEAMLIST	blist;
 	double	eravg, d;
 	register HOLO	*hp;