--- ray/src/util/ranimove1.c	2003/06/05 19:29:35	3.3
+++ ray/src/util/ranimove1.c	2003/07/21 22:30:19	3.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ranimove1.c,v 3.3 2003/06/05 19:29:35 schorsch Exp $";
+static const char	RCSid[] = "$Id: ranimove1.c,v 3.5 2003/07/21 22:30:19 schorsch Exp $";
 #endif
 /*
  *  ranimove1.c
@@ -11,6 +11,8 @@ static const char	RCSid[] = "$Id: ranimove1.c,v 3.3 20
 
 #include "copyright.h"
 
+#include <string.h>
+
 #include "platform.h"
 #include "ranimove.h"
 #include "otypes.h"
@@ -77,9 +79,9 @@ next_frame()			/* prepare next frame buffer */
 	char	*err;
 					/* get previous view */
 	if (vw.type != 0)
-		copystruct(&vwprev, &vw);
+		vwprev = vw;
 	else if (fcur > 1 && (fv = getview(fcur-1)) != NULL) {
-		copystruct(&vwprev, fv);
+		vwprev = *fv;
 		if (setview(&vwprev) != NULL)
 			vwprev.type = 0;
 	}
@@ -88,7 +90,7 @@ next_frame()			/* prepare next frame buffer */
 		sprintf(errmsg, "cannot get view for frame %d", fcur);
 		error(USER, errmsg);
 	}
-	copystruct(&vw, fv);
+	vw = *fv;
 	if ((err = setview(&vw)) != NULL) {
 		sprintf(errmsg, "view error at frame %d: %s", fcur, err);
 		error(USER, errmsg);
@@ -139,8 +141,8 @@ next_frame()			/* prepare next frame buffer */
 		fp = zprev; zprev = zbuffer; zbuffer = fp;
 		op = oprev; oprev = obuffer; obuffer = op;
 		bp = aprev; aprev = abuffer; abuffer = bp;
-		bzero(abuffer, sizeof(BYTE)*hres*vres);
-		bzero(sbuffer, sizeof(BYTE)*hres*vres);
+		memset(abuffer, '\0', sizeof(BYTE)*hres*vres);
+		memset(sbuffer, '\0', sizeof(BYTE)*hres*vres);
 		frm_stop += rtperfrm;
 	}
 	cerrmap = NULL;
@@ -638,11 +640,12 @@ init_frame()			/* render base (low quality) frame */
 	restart = (!nobjects || vdef(MOVE));
 	if (!restart && curparams != &lorendparams && nprocs > 1)
 		restart = -1;
-	if (restart > 0)
+	if (restart > 0) {
 		if (nprocs > 1)
 			ray_pdone(1);
 		else
 			ray_done(1);
+	}
 					/* post low quality parameters */
 	if (curparams != &lorendparams)
 		ray_restore(curparams = &lorendparams);
@@ -757,8 +760,8 @@ write_map(cerrmap, "outcmap.pic");
 		int	n2;
 		int	cnt;
 					/* sum in motion streaks */
-		bzero(outbuffer, sizeof(COLOR)*hres*vres);
-		bzero(wbuffer, sizeof(float)*hres*vres);
+		memset(outbuffer, '\0', sizeof(COLOR)*hres*vres);
+		memset(wbuffer, '\0', sizeof(float)*hres*vres);
 		for (y = vres; y--; )
 		    for (x = hres; x--; ) {
 			n = fndx(x, y);