--- ray/src/common/lamps.c	1990/12/08 09:28:16	1.1
+++ ray/src/common/lamps.c	1993/08/23 10:12:43	2.3
@@ -92,17 +92,17 @@ char	*file;
 				goto fmterr;
 			}
 		} else {			/* or read specificaion */
-			if ((lp->color=(float *)malloc(3*sizeof(float)))==NULL)
+			if ((lp->color=(float *)malloc(6*sizeof(float)))==NULL)
 				goto memerr;
-			if (sscanf(cp1, "%f %f %f", &lp->color[0], &
-					lp->color[1], &lp->color[2]) != 3) {
+			if (sscanf(cp1, "%f %f %f", &lp->color[3], &
+					lp->color[4], &lp->color[5]) != 3) {
 				cp1 = "bad lamp data";
 				goto fmterr;
 			}
 						/* convert xyY to XYZ */
-			xyz[1] = lp->color[2];
-			xyz[0] = lp->color[0]/lp->color[1] * xyz[1];
-			xyz[2] = xyz[1]*(1./lp->color[1] - 1.) - xyz[0];
+			xyz[1] = lp->color[5];
+			xyz[0] = lp->color[3]/lp->color[4] * xyz[1];
+			xyz[2] = xyz[1]*(1./lp->color[4] - 1.) - xyz[0];
 						/* XYZ to RGB */
 			cie_rgb(lp->color, xyz);
 		}
@@ -114,7 +114,7 @@ char	*file;
 		lastp = lp;
 	}
 	fclose(fp);
-	return(1);
+	return(lastp != NULL);
 memerr:
 	fputs("Out of memory in loadlamps\n", stderr);
 	return(-1);
@@ -122,4 +122,23 @@ fmterr:
 	fputs(buf, stderr);
 	fprintf(stderr, "%s: %s\n", file, cp1);
 	return(-1);
+}
+
+
+freelamps()			/* free our lamps list */
+{
+	register LAMP	*lp1, *lp2;
+	
+	for (lp1 = lamps; lp1 != NULL; lp1 = lp2) {
+		free(lp1->pattern);
+		if (lp1->color != NULL) {
+			for (lp2 = lp1->next; lp2 != NULL; lp2 = lp2->next)
+				if (lp2->color == lp1->color)
+					lp2->color = NULL;
+			free((char *)lp1->color);
+		}
+		lp2 = lp1->next;
+		free((char *)lp1);
+	}
+	lamps = NULL;
 }