30 |
|
register int i; |
31 |
|
|
32 |
|
if ((modset = (OBJECT *)m->os) == NULL) { |
33 |
< |
register OBJECT mod; |
33 |
> |
OBJECT obj, mod; |
34 |
|
|
35 |
|
if (m->oargs.nsargs < 1 || m->oargs.nsargs > MAXSET) |
36 |
|
objerror(m, USER, "bad # arguments"); |
37 |
+ |
obj = objndx(m); |
38 |
|
modset = (OBJECT *)malloc((m->oargs.nsargs+1)*sizeof(OBJECT)); |
39 |
|
if (modset == NULL) |
40 |
|
error(SYSTEM, "out of memory in m_clip"); |
42 |
|
for (i = 0; i < m->oargs.nsargs; i++) { |
43 |
|
if (!strcmp(m->oargs.sarg[i], VOIDID)) |
44 |
|
continue; |
45 |
< |
if ((mod = modifier(m->oargs.sarg[i])) == OVOID) { |
45 |
> |
if ((mod = lastmod(obj, m->oargs.sarg[i])) == OVOID) { |
46 |
|
sprintf(errmsg, "unknown modifier \"%s\"", |
47 |
|
m->oargs.sarg[i]); |
48 |
|
objerror(m, WARNING, errmsg); |
54 |
|
} |
55 |
|
insertelem(modset, mod); |
56 |
|
} |
57 |
< |
(OBJECT *)m->os = modset; |
57 |
> |
m->os = (char *)modset; |
58 |
|
} |
59 |
|
if (r->clipset != NULL) |
60 |
|
setcopy(cset, r->clipset); |
90 |
|
inside--; |
91 |
|
if (inside > 0) { /* we just hit the object */ |
92 |
|
flipsurface(r); |
93 |
< |
rayshade(r, modifier(m->oargs.sarg[0])); |
93 |
< |
return; |
93 |
> |
return(rayshade(r, modifier(m->oargs.sarg[0]))); |
94 |
|
} |
95 |
|
} |
96 |
|
raytrans(r); /* else transfer ray */ |
97 |
+ |
return(1); |
98 |
|
} |