| 1 |
< |
/* Copyright (c) 1994 Regents of the University of California */ |
| 1 |
> |
/* Copyright (c) 1995 Regents of the University of California */ |
| 2 |
|
|
| 3 |
|
#ifndef lint |
| 4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
| 195 |
|
error(USER, errmsg); |
| 196 |
|
} |
| 197 |
|
******/ |
| 198 |
< |
if ((*ofun[m->otype].funp)(m, r)) |
| 199 |
< |
objerror(r->ro, USER, "conflicting materials"); |
| 198 |
> |
if ((*ofun[m->otype].funp)(m, r)) { |
| 199 |
> |
sprintf(errmsg, "conflicting material \"%s\"", |
| 200 |
> |
m->oname); |
| 201 |
> |
objerror(r->ro, USER, errmsg); |
| 202 |
> |
} |
| 203 |
|
} |
| 204 |
|
depth--; /* end here */ |
| 205 |
|
} |
| 399 |
|
return(0); |
| 400 |
|
} |
| 401 |
|
cxset[0] = 0; |
| 402 |
< |
return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT && |
| 403 |
< |
r->ro != &Aftplane); |
| 402 |
> |
raymove(curpos, cxset, sflags, r, scene); |
| 403 |
> |
return(r->ro != NULL & r->ro != &Aftplane); |
| 404 |
|
} |
| 405 |
|
|
| 406 |
|
|
| 455 |
|
} |
| 456 |
|
/*NOTREACHED*/ |
| 457 |
|
} |
| 458 |
< |
if (isfull(cu->cutree) && checkhit(r, cu, cxs)) |
| 458 |
> |
if (isfull(cu->cutree)) { |
| 459 |
> |
if (checkhit(r, cu, cxs)) |
| 460 |
> |
return(RAYHIT); |
| 461 |
> |
} else if (r->ro == &Aftplane && incube(cu, r->rop)) |
| 462 |
|
return(RAYHIT); |
| 463 |
|
/* advance to next cube */ |
| 464 |
|
if (dirf&0x11) { |
