--- ray/src/rt/raycalls.c	2005/06/15 15:36:52	2.14
+++ ray/src/rt/raycalls.c	2009/12/12 05:20:10	2.17
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: raycalls.c,v 2.14 2005/06/15 15:36:52 greg Exp $";
+static const char	RCSid[] = "$Id: raycalls.c,v 2.17 2009/12/12 05:20:10 greg Exp $";
 #endif
 /*
  *  raycalls.c - interface for running Radiance rendering as a library
@@ -154,7 +154,7 @@ char	*amblist[AMBLLEN+1];		/* ambient include/exclude 
 int	ambincl = -1;			/* include == 1, exclude == 0 */
 
 
-extern void
+void
 ray_init(			/* initialize ray-tracing calculation */
 	char	*otnm
 )
@@ -165,8 +165,13 @@ ray_init(			/* initialize ray-tracing calculation */
 	if (ofun[OBJ_SPHERE].funp == o_default)
 		initotypes();
 					/* initialize urand */
-	initurand(2048);
-	srandom(rand_samp ? (long)time(0) : 0L);
+	if (rand_samp) {
+		srandom((long)time(0));
+		initurand(0);
+	} else {
+		srandom(0L);
+		initurand(2048);
+	}
 					/* read scene octree */
 	readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
 	nsceneobjs = nobjects;
@@ -177,18 +182,18 @@ ray_init(			/* initialize ray-tracing calculation */
 					/* ready to go... */
 }
 
-extern void
+void
 ray_trace(			/* trace a primary ray */
 	RAY	*r
 )
 {
 	rayorigin(r, PRIMARY, NULL, NULL);
-	samplendx = rand_samp ? random() : samplendx+1;
+	samplendx++;
 	rayvalue(r);		/* assumes origin and direction are set */
 }
 
 
-extern void
+void
 ray_done(		/* free ray-tracing data */
 	int	freall
 )
@@ -216,7 +221,7 @@ ray_done(		/* free ray-tracing data */
 }
 
 
-extern void
+void
 ray_save(			/* save current parameter settings */
 	RAYPARAMS	*rp
 )
@@ -267,7 +272,7 @@ ray_save(			/* save current parameter settings */
 }
 
 
-extern void
+void
 ray_restore(			/* restore parameter settings */
 	RAYPARAMS	*rp
 )
@@ -335,7 +340,7 @@ ray_restore(			/* restore parameter settings */
 }
 
 
-extern void
+void
 ray_defaults(		/* get default parameter values */
 	RAYPARAMS	*rp
 )