--- ray/src/rt/srcobstr.c	2004/01/09 05:37:12	2.3
+++ ray/src/rt/srcobstr.c	2004/06/22 13:40:54	2.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: srcobstr.c,v 2.3 2004/01/09 05:37:12 greg Exp $";
+static const char RCSid[] = "$Id: srcobstr.c,v 2.5 2004/06/22 13:40:54 greg Exp $";
 #endif
 /*
  * Source occlusion caching routines
@@ -197,7 +197,7 @@ srcobstructp(register RAY *r)
 		ondx += (int)(2*SHADCACHE*srcp->obscache->p.d.e2 *
 				(r->rorg[ax2] + t*srcp->sloc[ax2] -
 					srcp->obscache->p.d.o[ax2]));
-		if (ondx < 0 | ondx >= 4*SHADCACHE*SHADCACHE)
+		if ((ondx < 0) | (ondx >= 4*SHADCACHE*SHADCACHE))
 			return(&noobs); /* could happen if ray is outside */
 	} else if (srcp->sflags & SFLAT) {
 		FVECT   sd;
@@ -281,7 +281,7 @@ srcblocker(register RAY *r)
 	m = findmaterial(r->ro);
 	if (m == NULL)
 		return;			/* no material?! */
-	if (!(ofun[m->otype].flags & T_OPAQUE))
+	if (!isopaque(m->otype))
 		return;			/* material not a reliable blocker */
 	*srcobstructp(r) = r->robj;     /* else record obstructor */
 }