--- ray/src/util/ranimove1.c	2020/03/12 17:19:18	3.25
+++ ray/src/util/ranimove1.c	2023/11/17 20:02:08	3.27
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ranimove1.c,v 3.25 2020/03/12 17:19:18 greg Exp $";
+static const char	RCSid[] = "$Id: ranimove1.c,v 3.27 2023/11/17 20:02:08 greg Exp $";
 #endif
 /*
  *  ranimove1.c
@@ -330,7 +330,7 @@ setmotion(		/* compute motion vector for this pixel */
 		multp3(ovp, wpos, obj_move[moi].bxfm);
 		wpos = ovp;
 	}
-	if (viewloc(ovp, &vwprev, wpos) <= 0)
+	if (viewloc(ovp, &vwprev, wpos) != VL_GOOD)
 		return;
 	xp = (int)(ovp[0]*hres);
 	yp = (int)(ovp[1]*vres);
@@ -379,7 +379,7 @@ init_frame_sample(void)		/* sample our initial frame *
 					rayshade(&ir, ir.ro->omod);
 					rayparticipate(&ir);
 				}
-				copycolor(cbuffer[n], ir.rcol);
+				scolor_rgb(cbuffer[n], ir.rcol);
 				zbuffer[n] = ir.rot;
 				obuffer[n] = ir.robj;
 				abuffer[n] = ADISTANT;
@@ -403,7 +403,7 @@ init_frame_sample(void)		/* sample our initial frame *
 			n = ir.rno;
 		} else
 			ray_trace(&ir);
-		copycolor(cbuffer[n], ir.rcol);
+		scolor_rgb(cbuffer[n], ir.rcol);
 		zbuffer[n] = ir.rot;
 		obuffer[n] = ir.robj;
 		sbuffer[n] = 1;
@@ -417,7 +417,7 @@ init_frame_sample(void)		/* sample our initial frame *
 	if (nprocs > 1)			/* get stragglers */
 		while (ray_presult(&ir, 0)) {
 			n = ir.rno;
-			copycolor(cbuffer[n], ir.rcol);
+			scolor_rgb(cbuffer[n], ir.rcol);
 			zbuffer[n] = ir.rot;
 			obuffer[n] = ir.robj;
 			sbuffer[n] = 1;