--- ray/src/rt/sphere.c	1992/10/24 08:15:32	2.2
+++ ray/src/rt/sphere.c	2004/03/30 16:13:01	2.7
@@ -1,29 +1,28 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: sphere.c,v 2.7 2004/03/30 16:13:01 schorsch Exp $";
 #endif
-
 /*
  *  sphere.c - compute ray intersection with spheres.
- *
- *     8/19/85
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
+#include  "ray.h"
 #include  "otypes.h"
+#include  "rtotypes.h"
 
 
-o_sphere(so, r)			/* compute intersection with sphere */
-OBJREC  *so;
-register RAY  *r;
+extern int
+o_sphere(			/* compute intersection with sphere */
+	OBJREC  *so,
+	register RAY  *r
+)
 {
 	double  a, b, c;	/* coefficients for quadratic equation */
 	double  root[2];	/* quadratic roots */
 	int  nroots;
 	double  t;
-	register FLOAT  *ap;
+	register RREAL  *ap;
 	register int  i;
 
 	if (so->oargs.nfargs != 4)
@@ -80,6 +79,8 @@ register RAY  *r;
 	}
 	r->rod = -DOT(r->rdir, r->ron);
 	r->rox = NULL;
+	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
+	r->uv[0] = r->uv[1] = 0.0;
 
 	return(1);			/* hit */
 }