--- ray/src/rt/source.c	1991/06/20 13:43:29	1.35
+++ ray/src/rt/source.c	1991/07/11 16:39:03	1.39
@@ -43,7 +43,7 @@ marksources()			/* find and mark source objects */
 {
 	int  i;
 	register OBJREC  *o, *m;
-	register SRCREC  *ns;
+	register int  ns;
 					/* initialize dispatch table */
 	initstypes();
 					/* find direct sources */
@@ -72,20 +72,26 @@ marksources()			/* find and mark source objects */
 				sfun[o->otype].of->setsrc == NULL)
 			objerror(o, USER, "illegal material");
 
-		if ((ns = newsource()) == NULL)
+		if ((ns = newsource()) < 0)
 			goto memerr;
 
-		(*sfun[o->otype].of->setsrc)(ns, o);
+		setsource(&source[ns], o);
 
 		if (m->otype == MAT_GLOW) {
-			ns->sflags |= SPROX;
-			ns->sl.prox = m->oargs.farg[3];
+			source[ns].sflags |= SPROX;
+			source[ns].sl.prox = m->oargs.farg[3];
 			if (o->otype == OBJ_SOURCE)
-				ns->sflags |= SSKIP;
+				source[ns].sflags |= SSKIP;
 		} else if (m->otype == MAT_SPOT) {
-			ns->sflags |= SSPOT;
-			if ((ns->sl.s = makespot(m)) == NULL)
+			source[ns].sflags |= SSPOT;
+			if ((source[ns].sl.s = makespot(m)) == NULL)
 				goto memerr;
+			if (source[ns].sflags & SFLAT &&
+				!checkspot(source[ns].sl.s,source[ns].snorm)) {
+				objerror(o, WARNING,
+					"invalid spotlight direction");
+				source[ns].sflags |= SSKIP;
+			}
 		}
 	}
 	if (nsources <= 0) {
@@ -95,7 +101,7 @@ marksources()			/* find and mark source objects */
 	markvirtuals();			/* find and add virtual sources */
 	srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
 	cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
-	if (srccnt != NULL && cntord != NULL)
+	if (srccnt == NULL || cntord == NULL)
 		goto memerr;
 	return;
 memerr:
@@ -146,7 +152,7 @@ register int  sn;		/* source number */
 		for (i = 0; i < 3; i++) {
 			dimlist[ndims] = i + 8831;
 			vd[i] = dstrsrc * source[sn].ss *
-		(1.0 - 2.0*urand(ilhash(dimlist,ndims+1)+samplendx));
+		(1.0 - 2.0*urand(urind(ilhash(dimlist,ndims+1),samplendx)));
 		}
 		ndims--;
 		if (source[sn].sflags & SFLAT) {	/* project offset */