--- ray/src/common/loadvars.c	1995/12/12 14:00:48	2.1
+++ ray/src/common/loadvars.c	1996/01/23 11:52:57	2.3
@@ -76,9 +76,11 @@ register char	*ass;
 	for (n = strlen(ass); n > 0; n--)
 		if (!isspace(ass[n-1]))
 			break;
-	if (!n && !nowarn) {
-		fprintf(stderr, "%s: warning - missing value for variable '%s'\n",
-				progname, varname);
+	if (!n) {
+		if (!nowarn)
+			fprintf(stderr,
+			"%s: warning - missing value for variable '%s'\n",
+					progname, varname);
 		return;
 	}
 					/* match variable from list */
@@ -133,15 +135,15 @@ char	*nam;
 
 
 char *
-nvalue(vp, n)			/* return nth variable value */
-VARIABLE	*vp;
+nvalue(vn, n)			/* return nth variable value */
+register int	vn;
 register int	n;
 {
 	register char	*cp;
 
-	if (vp == NULL | n < 0 | n >= vp->nass)
+	if (vval(vn) == NULL | n < 0 | n >= vdef(vn))
 		return(NULL);
-	cp = vp->value;
+	cp = vval(vn);
 	while (n--)
 		while (*cp++)
 			;
@@ -279,7 +281,7 @@ register FILE	*fp;
 		fputs("= ", fp);
 		k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 )
 				- strlen(vnam(i)) ;
-		cp = nvalue(vv+i, j);
+		cp = nvalue(i, j);
 		while (*cp) {
 		    putc(*cp++, fp);
 		    if (--k <= 0) {		/* line too long */