--- ray/src/rt/ambio.c	2017/01/27 22:00:49	2.12
+++ ray/src/rt/ambio.c	2019/05/14 17:39:10	2.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ambio.c,v 2.12 2017/01/27 22:00:49 greg Exp $";
+static const char	RCSid[] = "$Id: ambio.c,v 2.13 2019/05/14 17:39:10 greg Exp $";
 #endif
 /*
  * Read and write portable ambient values
@@ -39,8 +39,6 @@ FILE  *fp;
 }
 
 
-#ifndef OLDAMB
-
 #define  putpos(v,fp)	putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
 
 #define  getpos(v,fp)	(v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
@@ -121,82 +119,3 @@ readambval(			/* read ambient value from stream */
 	av->corral = (uint32)getint(sizeof(av->corral), fp);
 	return(feof(fp) ? 0 : ambvalOK(av));
 }
-
-
-#else /* ! NEWAMB */
-
-
-#define  putvec(v,fp)	putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
-
-#define  getvec(v,fp)	(v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
-
-
-int
-writambval(av, fp)		/* write ambient value to stream */
-AMBVAL  *av;
-FILE  *fp;
-{
-	COLR  clr;
-
-	putint(av->lvl, 1, fp);
-	putflt(av->weight, fp);
-	putvec(av->pos, fp);
-	putvec(av->dir, fp);
-	setcolr(clr, colval(av->val,RED),
-			colval(av->val,GRN), colval(av->val,BLU));
-	putbinary((char *)clr, sizeof(clr), 1, fp);
-	putflt(av->rad, fp);
-	putvec(av->gpos, fp);
-	putvec(av->gdir, fp);
-	return(ferror(fp) ? -1 : 0);
-}
-
-
-int
-ambvalOK(av)			/* check consistency of ambient value */
-AMBVAL  *av;
-{
-	double	d;
-
-	if (badvec(av->pos)) return(0);
-	if (badvec(av->dir)) return(0);
-	d = DOT(av->dir,av->dir);
-	if (d < 0.9999 || d > 1.0001) return(0);
-	if (av->lvl < 0 || av->lvl > 100) return(0);
-	if (av->weight <= 0. || av->weight > 1.) return(0);
-	if (av->rad <= 0. || av->rad >= FHUGE) return(0);
-	if (colval(av->val,RED) < 0. ||
-			colval(av->val,RED) > FHUGE ||
-			colval(av->val,GRN) < 0. ||
-			colval(av->val,GRN) > FHUGE ||
-			colval(av->val,BLU) < 0. ||
-			colval(av->val,BLU) > FHUGE) return(0);
-	if (badvec(av->gpos)) return(0);
-	if (badvec(av->gdir)) return(0);
-	return(1);
-}
-
-
-int
-readambval(av, fp)		/* read ambient value from stream */
-AMBVAL  *av;
-FILE  *fp;
-{
-	COLR  clr;
-
-	av->lvl = getint(1, fp);
-	if (feof(fp))
-		return(0);
-	av->weight = getflt(fp);
-	getvec(av->pos, fp);
-	getvec(av->dir, fp);
-	if (getbinary((char *)clr, sizeof(clr), 1, fp) != 1)
-		return(0);
-	colr_color(av->val, clr);
-	av->rad = getflt(fp);
-	getvec(av->gpos, fp);
-	getvec(av->gdir, fp);
-	return(feof(fp) ? 0 : ambvalOK(av));
-}
-
-#endif	/* ! NEWAMB */