--- ray/src/ot/o_face.c 2003/02/22 02:07:26 2.2 +++ ray/src/ot/o_face.c 2004/03/27 12:41:45 2.4 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: o_face.c,v 2.2 2003/02/22 02:07:26 greg Exp $"; +static const char RCSid[] = "$Id: o_face.c,v 2.4 2004/03/27 12:41:45 schorsch Exp $"; #endif /* * o_face.c - routines for creating octrees for polygonal faces. @@ -37,10 +37,12 @@ static const char RCSid[] = "$Id: o_face.c,v 2.2 2003/ * 5) If test 4 fails, we have no intersection. */ - -o_face(o, cu) /* determine if face intersects cube */ -OBJREC *o; -CUBE *cu; +/* XXX this is extern, but not declared in any header file yet */ +int +o_face( /* determine if face intersects cube */ + OBJREC *o, + CUBE *cu +) { FVECT cumin, cumax; FVECT v1, v2; @@ -59,7 +61,7 @@ CUBE *cu; vloc = ABOVE | BELOW; /* check vertices */ for (i = 0; i < f->nv; i++) - if (j = plocate(VERTEX(f,i), cumin, cumax)) + if ( (j = plocate(VERTEX(f,i), cumin, cumax)) ) vloc &= j; else return(O_HIT); /* vertex inside */