53 |
|
} |
54 |
|
fobj = m; |
55 |
|
fray = r; |
56 |
< |
fxf.sca = r->ros * sca; |
57 |
< |
multmat4(fxf.xfm, r->rox, xfm); |
56 |
> |
fxf.sca = r->robs * sca; |
57 |
> |
multmat4(fxf.xfm, r->robx, xfm); |
58 |
|
eclock++; /* notify expression evaluator */ |
59 |
|
} |
60 |
|
|
66 |
|
register XF *mxf; |
67 |
|
|
68 |
|
if ((mxf = (XF *)m->os) == NULL) { |
69 |
< |
register int n = m->oargs.nsargs; |
70 |
< |
register char **sa = m->oargs.sarg; |
69 |
> |
register int n; |
70 |
> |
register char **sa; |
71 |
|
|
72 |
< |
while (n > 0 && **sa != '-') { |
73 |
< |
n--; |
74 |
< |
sa++; |
75 |
< |
} |
72 |
> |
for (n = m->oargs.nsargs, sa = m->oargs.sarg; |
73 |
> |
n > 0 && **sa != '-'; n--, sa++) |
74 |
> |
; |
75 |
|
mxf = (XF *)malloc(sizeof(XF)); |
76 |
|
if (mxf == NULL) |
77 |
|
goto memerr; |
97 |
|
extern char *libpath; /* library search path */ |
98 |
|
char *ffname; |
99 |
|
|
100 |
< |
if ((ffname = getpath(fname, libpath)) == NULL) { |
100 |
> |
if ((ffname = getpath(fname, libpath, R_OK)) == NULL) { |
101 |
|
sprintf(errmsg, "cannot find function file \"%s\"", fname); |
102 |
|
error(USER, errmsg); |
103 |
|
} |