| 28 |
|
char *pathname; |
| 29 |
|
register SCENE *sc; |
| 30 |
|
|
| 31 |
< |
flags &= ~IO_FILES; /* not allowed */ |
| 31 |
> |
flags &= ~(IO_FILES|IO_INFO); /* not allowed */ |
| 32 |
|
for (sc = slist; sc != NULL; sc = sc->next) |
| 33 |
|
if (!strcmp(sname, sc->name)) { |
| 34 |
|
if ((sc->ldflags & flags) == flags) |
| 44 |
|
sc->next = slist; |
| 45 |
|
slist = sc; |
| 46 |
|
} |
| 47 |
< |
if ((pathname = getpath(sname, libpath)) == NULL) { |
| 47 |
> |
if ((pathname = getpath(sname, libpath, R_OK)) == NULL) { |
| 48 |
|
sprintf(errmsg, "cannot find octree file \"%s\"", sname); |
| 49 |
|
error(USER, errmsg); |
| 50 |
|
} |
| 66 |
|
error(SYSTEM, "out of memory in getinstance"); |
| 67 |
|
if (o->oargs.nsargs < 1) |
| 68 |
|
objerror(o, USER, "bad # of arguments"); |
| 69 |
– |
in->f.sca = 1.0; |
| 70 |
– |
setident4(in->f.xfm); |
| 69 |
|
if (xf(in->f.xfm, &in->f.sca, o->oargs.nsargs-1, |
| 70 |
|
o->oargs.sarg+1) != o->oargs.nsargs-1) |
| 71 |
|
objerror(o, USER, "bad transform"); |
| 72 |
|
if (in->f.sca < 0.0) |
| 73 |
|
in->f.sca = -in->f.sca; |
| 76 |
– |
in->b.sca = 1.0; |
| 77 |
– |
setident4(in->b.xfm); |
| 74 |
|
invxf(in->b.xfm, &in->b.sca,o->oargs.nsargs-1,o->oargs.sarg+1); |
| 75 |
|
if (in->b.sca < 0.0) |
| 76 |
|
in->b.sca = -in->b.sca; |
| 77 |
|
in->obj = NULL; |
| 78 |
< |
(INSTANCE *)o->os = in; |
| 78 |
> |
o->os = (char *)in; |
| 79 |
|
} |
| 80 |
|
if (in->obj == NULL || (in->obj->ldflags & flags) != flags) |
| 81 |
|
in->obj = getscene(o->oargs.sarg[0], flags); |
