--- ray/src/hd/rhd_qtree2r.c	1997/11/25 17:33:02	3.2
+++ ray/src/hd/rhd_qtree2r.c	2003/07/27 22:12:02	3.5
@@ -1,9 +1,6 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rhd_qtree2r.c,v 3.5 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Quadtree display support routines for rectangle output.
  */
@@ -26,13 +23,13 @@ int	l[2][2];
 	my = (y0 + y1) >> 1;
 					/* see what to do */
 	if (l[0][0] > mx)
-		quads &= ~(CHF(2)|CHF(0));
+		quads &= ~(CHF(UL)|CHF(DL));
 	else if (l[0][1] < mx)
-		quads &= ~(CHF(3)|CHF(1));
+		quads &= ~(CHF(UR)|CHF(DR));
 	if (l[1][0] > my)
-		quads &= ~(CHF(1)|CHF(0));
+		quads &= ~(CHF(DR)|CHF(DL));
 	else if (l[1][1] < my)
-		quads &= ~(CHF(3)|CHF(2));
+		quads &= ~(CHF(UR)|CHF(UL));
 	tp->flgs |= quads;		/* mark quadrants for update */
 					/* climb the branches */
 	for (i = 0; i < 4; i++)
@@ -115,8 +112,8 @@ int	x0, y0, x1, y1;
 
 	if (is_stump(&qtrunk))
 		return;
-	if (!qtMapLeaves((lim[0][0]=x0) <= 0 & (lim[1][0]=y0) <= 0 &
-		(lim[0][1]=x1) >= odev.hres-1 & (lim[1][1]=y1) >= odev.vres-1))
+	if (!qtMapLeaves(((lim[0][0]=x0) <= 0) & ((lim[1][0]=y0) <= 0) &
+		((lim[0][1]=x1) >= odev.hres-1) & ((lim[1][1]=y1) >= odev.vres-1)))
 		return;
 	redraw(&qtrunk, 0, 0, odev.hres, odev.vres, lim);
 }