--- ray/src/util/rad.c	1993/07/16 12:41:21	2.15
+++ ray/src/util/rad.c	1993/08/24 20:29:22	2.19
@@ -310,7 +310,7 @@ register int	n;
 {
 	register char	*cp;
 
-	if (vp == NULL || n < 0 || n >= vp->nass)
+	if (vp == NULL | n < 0 | n >= vp->nass)
 		return(NULL);
 	cp = vp->value;
 	while (n--)
@@ -626,7 +626,7 @@ register char	*op;
 		op = addarg(op, "-ds .4");
 	else
 		op = addarg(op, "-ds 0");
-	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .7");
+	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
 	if (vdef(AMBFILE)) {
 		sprintf(op, " -af %s", vval(AMBFILE));
 		op += strlen(op);
@@ -634,13 +634,13 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .4 -ad 32");
+		op = addarg(op, "-aa .4 -ad 64");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .3 -ad 64");
+		op = addarg(op, "-aa .3 -ad 128");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .25 -ad 128");
+		op = addarg(op, "-aa .25 -ad 256");
 		break;
 	}
 	op = addarg(op, "-as 0");
@@ -690,7 +690,7 @@ register char	*op;
 		op = addarg(op, "-ds .2 -dj .35");
 	else
 		op = addarg(op, "-ds .3");
-	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .15");
+	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
 	if (overture = vint(INDIRECT)) {
 		sprintf(op, " -ab %d", overture);
 		op += strlen(op);
@@ -702,13 +702,13 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .25 -ad 128 -as 0");
+		op = addarg(op, "-aa .25 -ad 196 -as 0");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .2 -ad 300 -as 64");
+		op = addarg(op, "-aa .2 -ad 400 -as 64");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .15 -ad 500 -as 128");
+		op = addarg(op, "-aa .15 -ad 768 -as 196");
 		break;
 	}
 	d = ambval();
@@ -757,7 +757,7 @@ register char	*op;
 		op = addarg(op, "-ds .1 -dj .7");
 	else
 		op = addarg(op, "-ds .2");
-	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .03");
+	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
 	sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
 	op += strlen(op);
 	if (vdef(AMBFILE)) {
@@ -767,13 +767,13 @@ register char	*op;
 		overture = 0;
 	switch (vscale(VARIABILITY)) {
 	case LOW:
-		op = addarg(op, "-aa .15 -ad 200 -as 0");
+		op = addarg(op, "-aa .15 -ad 256 -as 0");
 		break;
 	case MEDIUM:
-		op = addarg(op, "-aa .125 -ad 512 -as 128");
+		op = addarg(op, "-aa .125 -ad 512 -as 256");
 		break;
 	case HIGH:
-		op = addarg(op, "-aa .08 -ad 850 -as 256");
+		op = addarg(op, "-aa .08 -ad 1024 -as 512");
 		break;
 	}
 	d = ambval();
@@ -970,7 +970,7 @@ getview(n, vn)				/* get view n, or NULL if none */
 int	n;
 char	*vn;		/* returned view name */
 {
-	register char	*mv = NULL;
+	register char	*mv;
 
 	if (viewselect != NULL) {		/* command-line selected */
 		if (n)				/* only do one */
@@ -985,6 +985,9 @@ char	*vn;		/* returned view name */
 				;
 			*vn = '\0';
 		}
+						/* view number? */
+		if (isdigit(viewselect[0]))
+			return(specview(nvalue(vv+VIEW, atoi(viewselect)-1)));
 						/* check list */
 		while ((mv = nvalue(vv+VIEW, n++)) != NULL)
 			if (matchword(viewselect, mv))
@@ -993,9 +996,10 @@ char	*vn;		/* returned view name */
 	}
 	mv = nvalue(vv+VIEW, n);		/* use view n */
 	if (vn != NULL & mv != NULL) {
-		if (*mv != '-')
-			while (*mv && !isspace(*mv))
-				*vn++ = *mv++;
+		register char	*mv2 = mv;
+		if (*mv2 != '-')
+			while (*mv2 && !isspace(*mv2))
+				*vn++ = *mv2++;
 		*vn = '\0';
 	}
 	return(specview(mv));