--- ray/src/hd/rhdisp2.c 2003/02/22 02:07:24 3.33 +++ ray/src/hd/rhdisp2.c 2003/06/20 00:25:49 3.35 @@ -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.35 2003/06/20 00:25:49 greg 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"); @@ -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;