--- ray/src/util/ranimove.c	2003/03/10 17:26:26	3.3
+++ ray/src/util/ranimove.c	2003/10/21 19:19:29	3.9
@@ -11,11 +11,18 @@ static const char RCSid[] = "$Id";
 
 #include "copyright.h"
 
-#include "ranimove.h"
 #include <time.h>
-#include <sys/time.h>
+#ifdef _WIN32
+  #include <winsock.h> /* struct timeval. XXX find a replacement? */
+#else
+  #include <sys/time.h>
+#endif
 #include <ctype.h>
+#include <string.h>
 
+#include "paths.h"
+#include "ranimove.h"
+
 int		NVARS = NV_INIT; /* total number of variables */
 
 VARIABLE	vv[] = VV_INIT;	/* variable-value pairs */
@@ -92,7 +99,7 @@ char	*argv[];
 		case 'f':			/* frame range */
 			switch (sscanf(argv[++i], "%d,%d", &fbeg, &fend)) {
 			case 2:
-				if ((fbeg <= 0 | fend < fbeg))
+				if ((fbeg <= 0) | (fend < fbeg))
 					goto userr;
 				break;
 			case 1:
@@ -136,7 +143,7 @@ char	*argv[];
 						/* all done */
 	if (lorendoptf[0])
 		unlink(lorendoptf);
-	if (hirendoptf[0])
+	if (hirendoptf[0] && strcmp(hirendoptf, lorendoptf))
 		unlink(hirendoptf);
 	if (objtmpf[0])
 		unlink(objtmpf);
@@ -242,7 +249,7 @@ setdefaults()			/* set default values */
 	setrendparams(lorendoptf, vval(LOWQ));
 	ray_save(&lorendparams);
 	curparams = &lorendparams;
-	twolevels = bcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
+	twolevels = memcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
 }
 
 
@@ -294,7 +301,7 @@ char	*ms;
 		if (isflt(om->prio_file)) {
 			om->prio = atof(om->prio_file);
 			om->prio_file[0] = '\0';
-			haveprio |= (om->prio < 0.95 | om->prio > 1.05);
+			haveprio |= ((om->prio < 0.95) | (om->prio > 1.05));
 		} else
 			haveprio = 1;
 	} else
@@ -329,8 +336,8 @@ char		*qval;
 	if (qval != NULL && qval[0] == '-')
 		ac += wordstring(av+ac, qval);
 
-				/* start with default parameters */
-	ray_defaults(NULL);
+				/* restore default parameters */
+	ray_restore(NULL);
 				/* set what we have */
 	for (i = 0; i < ac; i++) {
 		while ((rval = expandarg(&ac, &av, i)) > 0)
@@ -344,12 +351,11 @@ char		*qval;
 			continue;
 		}
 		rval = getrenderopt(ac-i, av+i);
-		if (rval >= 0) {
-			i += rval;
-			continue;
+		if (rval < 0) {
+			sprintf(errmsg, "bad render option at '%s'", av[i]);
+			error(USER, errmsg);
 		}
-		sprintf(errmsg, "bad render option at '%s'", av[i]);
-		error(USER, errmsg);
+		i += rval;
 	}
 }
 
@@ -383,7 +389,7 @@ char	*rfargs;
 			pippt = NULL;
 		}
 	if (pippt != NULL)
-		strcpy(pippt, "> /dev/null");	/* nothing to match */
+		strcpy(pippt, "> " NULL_DEVICE);	/* nothing to match */
 	else {
 		strcpy(cp, ")[ \t]*=' > ranimove.var");
 		cp += 11;		/* point to file name */
@@ -451,7 +457,7 @@ int	n;
 			fclose(viewfp);
 			viewfp = NULL;
 			viewnum = 0;
-			copystruct(&curview, &stdview);
+			curview = stdview;
 		}
 		return(NULL);
 	}
@@ -467,7 +473,7 @@ int	n;
 			perror(vval(VIEWFILE));
 			quit(1);
 		}
-		copystruct(&curview, &stdview);
+		curview = stdview;
 		viewnum = 0;
 	}
 	if (n < 0) {				/* get next view */
@@ -567,7 +573,7 @@ char	*s;
 		return(1.0);
 
 	expval = atof(s);
-	if ((s[0] == '+' | s[0] == '-'))
+	if ((s[0] == '+') | (s[0] == '-'))
 		return(pow(2.0, expval));
 	return(expval);
 }
@@ -756,11 +762,12 @@ int	n;
 		om->cprio = om->prio;
 	}
 					/* XXX bxfm relies on call order */
-	if (framestep)
+	if (framestep) {
 		if (invmat4(om->bxfm, om->cxfm))
 			multmat4(om->bxfm, om->bxfm, oxf.xfm);
 		else
 			setident4(om->bxfm);
+	}
 					/* all done */
 	return(xfp);
 }
@@ -786,7 +793,7 @@ OBJECT	obj;
 		objnm = obj_move[i].name;
 		len = strlen(objnm);
 		if (!strncmp(onm, objnm, len)) {
-			if ((obj_move[i].parent < 0 & onm[len] == '.'))
+			if ((obj_move[i].parent < 0) & (onm[len] == '.'))
 				break;
 			objnm = getobjname(&obj_move[i]) + len;
 			len2 = strlen(objnm);