--- ray/src/px/pcomb.c	1991/04/18 14:35:17	1.10
+++ ray/src/px/pcomb.c	1991/05/22 14:56:51	1.13
@@ -85,10 +85,10 @@ char	*argv[];
 	double	f;
 	int	a;
 	
-	funset(vcolin[RED], 1, l_redin);
-	funset(vcolin[GRN], 1, l_grnin);
-	funset(vcolin[BLU], 1, l_bluin);
-	funset(vbrtin, 1, l_brtin);
+	funset(vcolin[RED], 1, '=', l_redin);
+	funset(vcolin[GRN], 1, '=', l_grnin);
+	funset(vcolin[BLU], 1, '=', l_bluin);
+	funset(vbrtin, 1, '=', l_brtin);
 	
 	for (a = 1; a < argc; a++)
 		if (argv[a][0] == '-')
@@ -214,9 +214,9 @@ combine()			/* combine pictures */
 	else
 		brtdef = NULL;
 						/* predefine variables */
-	varset(vnfiles, (double)nfiles);
-	varset(vxres, (double)xres);
-	varset(vyres, (double)yres);
+	varset(vnfiles, '=', (double)nfiles);
+	varset(vxres, '=', (double)xres);
+	varset(vyres, '=', (double)yres);
 						/* allocate scanline */
 	scanout = (COLOR *)emalloc(xres*sizeof(COLOR));
 						/* combine files */
@@ -227,11 +227,11 @@ combine()			/* combine pictures */
 			    eputs(": read error\n");
 			    quit(1);
 		    }
-	    varset(vypos, (double)ypos);
+	    varset(vypos, '=', (double)ypos);
 	    for (xpos = 0; xpos < xres; xpos++) {
 		for (i = 0; i < nfiles; i++)
 			multcolor(input[i].scan[xpos],input[i].coef);
-		varset(vxpos, (double)xpos);
+		varset(vxpos, '=', (double)xpos);
 		eclock++;
 		if (brtdef != NULL) {
 		    d = evalue(brtdef);
@@ -241,15 +241,15 @@ combine()			/* combine pictures */
 		} else {
 		    for (j = 0; j < 3; j++) {
 			if (coldef[j] != NULL) {
-				colval(scanout[xpos],j) = evalue(coldef[j]);
+				d = evalue(coldef[j]);
 			} else {
-			    colval(scanout[xpos],j) = 0.0;
+			    d = 0.0;
 			    for (i = 0; i < nfiles; i++)
-				colval(scanout[xpos],j) +=
-					colval(input[i].scan[xpos],j);
+				d += colval(input[i].scan[xpos],j);
 			}
-			if (colval(scanout[xpos],j) < 0.0)
-			    colval(scanout[xpos],j) = 0.0;
+			if (d < 0.0)
+			    d = 0.0;
+			colval(scanout[xpos],j) = d;
 		    }
 		}
 	    }