77 |
|
TLINE tl; /* line list */ |
78 |
|
} TEXT; |
79 |
|
|
80 |
< |
extern char *libpath; |
80 |
> |
extern char *getlibpath(); |
81 |
|
|
82 |
|
extern char *fgetword(); |
83 |
|
|
109 |
|
sprintf(errmsg, "undefined modifier \"%s\"", modname); |
110 |
|
objerror(m, USER, errmsg); |
111 |
|
} |
112 |
< |
raytexture(r, omod); |
113 |
< |
} else if (m->otype == PAT_BTEXT) { |
112 |
> |
if (rayshade(r, omod)) { |
113 |
> |
if (m->omod != OVOID) |
114 |
> |
objerror(m, USER, "inappropriate modifier"); |
115 |
> |
return(1); |
116 |
> |
} |
117 |
> |
} |
118 |
> |
if (m->otype == PAT_BTEXT) { |
119 |
|
if (foreground) |
120 |
|
scalecolor(r->pcol, m->oargs.farg[9]); |
121 |
|
else |
132 |
|
m->oargs.farg[14]); |
133 |
|
multcolor(r->pcol, cval); |
134 |
|
} |
135 |
+ |
return(0); |
136 |
|
} |
137 |
|
|
138 |
|
|
201 |
|
tlp = tlp->next; |
202 |
|
} else { /* text file */ |
203 |
|
if ((s = getpath(tm->oargs.sarg[tndx(tm)], |
204 |
< |
libpath, R_OK)) == NULL) { |
204 |
> |
getlibpath(), R_OK)) == NULL) { |
205 |
|
sprintf(errmsg, "cannot find text file \"%s\"", |
206 |
|
tm->oargs.sarg[tndx(tm)]); |
207 |
|
error(USER, errmsg); |