--- ray/src/rt/srcsamp.c	1992/09/22 11:28:48	2.4
+++ ray/src/rt/srcsamp.c	2003/06/26 00:58:10	2.9
@@ -1,13 +1,14 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: srcsamp.c,v 2.9 2003/06/26 00:58:10 schorsch Exp $";
 #endif
-
 /*
  * Source sampling routines
+ *
+ *  External symbols declared in source.h
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
 #include  "source.h"
@@ -15,6 +16,9 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "random.h"
 
 
+static int  cyl_partit(), flt_partit();
+
+
 double
 nextssamp(r, si)		/* compute sample for source, rtn. distance */
 register RAY  *r;		/* origin is read, direction is set */
@@ -79,26 +83,28 @@ nextsample:
 		goto nextsample;		/* at source! */
 
 					/* compute sample size */
-	si->dom  = source[si->sn].ss2;
 	if (source[si->sn].sflags & SFLAT) {
-		si->dom *= sflatform(si->sn, r->rdir);
+		si->dom = sflatform(si->sn, r->rdir);
 		si->dom *= size[SU]*size[SV]/(MAXSPART*(double)MAXSPART);
 	} else if (source[si->sn].sflags & SCYL) {
-		si->dom *= scylform(si->sn, r->rdir);
+		si->dom = scylform(si->sn, r->rdir);
 		si->dom *= size[SU]/(double)MAXSPART;
 	} else {
-		si->dom *= size[SU]*size[SV]*(double)size[SW] /
+		si->dom = size[SU]*size[SV]*(double)size[SW] /
 				(MAXSPART*MAXSPART*(double)MAXSPART) ;
 	}
-	if (source[si->sn].sflags & SDISTANT)
+	if (source[si->sn].sflags & SDISTANT) {
+		si->dom *= source[si->sn].ss2;
 		return(FHUGE);
+	}
 	if (si->dom <= 1e-4)
 		goto nextsample;		/* behind source? */
-	si->dom /= d*d;
+	si->dom *= source[si->sn].ss2/(d*d);
 	return(d);		/* sample OK, return distance */
 }
 
 
+int
 skipparts(ct, sz, pp, pt)		/* skip to requested partition */
 int  ct[3], sz[3];		/* center and size of partition (returned) */
 register int  pp[2];		/* current index, number to skip (modified) */
@@ -130,6 +136,7 @@ unsigned char  *pt;		/* partition array */
 }
 
 
+void
 nopart(si, r)			/* single source partition */
 register SRCINDEX  *si;
 RAY  *r;
@@ -140,6 +147,7 @@ RAY  *r;
 }
 
 
+void
 cylpart(si, r)			/* partition a cylinder */
 SRCINDEX  *si;
 register RAY  *r;
@@ -216,11 +224,12 @@ double  d2;
 }
 
 
+void
 flatpart(si, r)				/* partition a flat source */
 register SRCINDEX  *si;
 register RAY  *r;
 {
-	register FLOAT  *vp;
+	register RREAL  *vp;
 	FVECT  v;
 	double  du2, dv2;
 	int  pi;
@@ -304,7 +313,7 @@ scylform(sn, dir)		/* compute cosine for cylinder's pr
 int  sn;
 register FVECT  dir;		/* assume normalized */
 {
-	register FLOAT  *dv;
+	register RREAL  *dv;
 	double  d;
 
 	dv = source[sn].ss[SU];