ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/ranimove.c

Comparing ray/src/util/ranimove.c (file contents):
Revision 3.6 by schorsch, Mon Jul 21 22:30:19 2003 UTC vs.
Revision 3.7 by schorsch, Sun Jul 27 22:12:03 2003 UTC

#	Line 97 | Line 97 | char   *argv[];
97		case 'f':                       /* frame range */
98		switch (sscanf(argv[++i], "%d,%d", &fbeg, &fend)) {
99		case 2:
100	<	if ((fbeg <= 0 | fend < fbeg))
100	>	if ((fbeg <= 0) | (fend < fbeg))
101		goto userr;
102		break;
103		case 1:
#	Line 299 | Line 299 | char   *ms;
299		if (isflt(om->prio_file)) {
300		om->prio = atof(om->prio_file);
301		om->prio_file[0] = '\0';
302	<	haveprio |= (om->prio < 0.95 | om->prio > 1.05);
302	>	haveprio |= ((om->prio < 0.95) | (om->prio > 1.05));
303		} else
304		haveprio = 1;
305		} else
#	Line 572 | Line 572 | char   *s;
572		return(1.0);
573
574		expval = atof(s);
575	<	if ((s[0] == '+' | s[0] == '-'))
575	>	if ((s[0] == '+') | (s[0] == '-'))
576		return(pow(2.0, expval));
577		return(expval);
578		}
#	Line 792 | Line 792 | OBJECT obj;
792		objnm = obj_move[i].name;
793		len = strlen(objnm);
794		if (!strncmp(onm, objnm, len)) {
795	<	if ((obj_move[i].parent < 0 & onm[len] == '.'))
795	>	if ((obj_move[i].parent < 0) & (onm[len] == '.'))
796		break;
797		objnm = getobjname(&obj_move[i]) + len;
798		len2 = strlen(objnm);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)