--- ray/src/rt/m_clip.c	1994/01/12 16:46:37	2.2
+++ ray/src/rt/m_clip.c	2005/04/19 01:15:06	2.9
@@ -1,16 +1,14 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: m_clip.c,v 2.9 2005/04/19 01:15:06 greg Exp $";
 #endif
-
 /*
  *  m_clip.c - routine for clipped (cut) objects.
- *
- *     3/17/86
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
+#include  "rtotypes.h"
 
 /*
  *  Clipping objects permit holes and sections to be taken out
@@ -21,17 +19,19 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 
-m_clip(m, r)			/* clip objects from ray */
-register OBJREC  *m;
-register RAY  *r;
+extern int
+m_clip(			/* clip objects from ray */
+	register OBJREC  *m,
+	register RAY  *r
+)
 {
 	OBJECT  cset[MAXSET+1], *modset;
+	OBJECT  obj, mod;
 	int  entering;
 	register int  i;
 
+	obj = objndx(m);
 	if ((modset = (OBJECT *)m->os) == NULL) {
-		register OBJECT  mod;
-
 		if (m->oargs.nsargs < 1 || m->oargs.nsargs > MAXSET)
 			objerror(m, USER, "bad # arguments");
 		modset = (OBJECT *)malloc((m->oargs.nsargs+1)*sizeof(OBJECT));
@@ -41,7 +41,7 @@ register RAY  *r;
 		for (i = 0; i < m->oargs.nsargs; i++) {
 			if (!strcmp(m->oargs.sarg[i], VOIDID))
 				continue;
-			if ((mod = modifier(m->oargs.sarg[i])) == OVOID) {
+			if ((mod = lastmod(obj, m->oargs.sarg[i])) == OVOID) {
 				sprintf(errmsg, "unknown modifier \"%s\"",
 						m->oargs.sarg[i]);
 				objerror(m, WARNING, errmsg);
@@ -78,18 +78,19 @@ register RAY  *r;
 	r->newcset = cset;
 	if (strcmp(m->oargs.sarg[0], VOIDID)) {
 		int  inside = 0;
-		register RAY  *rp;
+		register const RAY  *rp;
 					/* check for penetration */
 		for (rp = r; rp->parent != NULL; rp = rp->parent)
 			if (!(rp->rtype & RAYREFL) && rp->parent->ro != NULL
-					&& inset(modset, rp->parent->ro->omod))
+					&& inset(modset, rp->parent->ro->omod)) {
 				if (rp->parent->rod > 0.0)
 					inside++;
 				else
 					inside--;
+			}
 		if (inside > 0) {	/* we just hit the object */
 			flipsurface(r);
-			return(rayshade(r, modifier(m->oargs.sarg[0])));
+			return(rayshade(r, lastmod(obj, m->oargs.sarg[0])));
 		}
 	}
 	raytrans(r);			/* else transfer ray */