1 |
|
#ifndef lint |
2 |
< |
static const char RCSid[] = "$Id$"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
4 |
|
/* |
5 |
|
* instance.c - routines for octree objects. |
40 |
|
if (sc == NULL) { |
41 |
|
sc = (SCENE *)malloc(sizeof(SCENE)); |
42 |
|
if (sc == NULL) |
43 |
< |
error(SYSTEM, "out of memory ins getscene"); |
43 |
> |
error(SYSTEM, "out of memory in getscene"); |
44 |
|
sc->name = savestr(sname); |
45 |
|
sc->nref = 1; |
46 |
|
sc->ldflags = 0; |
52 |
|
sc->next = slist; |
53 |
|
slist = sc; |
54 |
|
} |
55 |
< |
if ((pathname = getpath(sname, getlibpath(), R_OK)) == NULL) { |
55 |
> |
if ((pathname = getpath(sname, getrlibpath(), R_OK)) == NULL) { |
56 |
|
sprintf(errmsg, "cannot find octree file \"%s\"", sname); |
57 |
|
error(USER, errmsg); |
58 |
|
} |
77 |
|
flags &= ~IO_ILLEGAL; /* not allowed */ |
78 |
|
if ((ins = (INSTANCE *)o->os) == NULL) { |
79 |
|
if ((ins = (INSTANCE *)malloc(sizeof(INSTANCE))) == NULL) |
80 |
< |
error(SYSTEM, "out of memory ins getinstance"); |
80 |
> |
error(SYSTEM, "out of memory in getinstance"); |
81 |
|
if (o->oargs.nsargs < 1) |
82 |
|
objerror(o, USER, "bad # of arguments"); |
83 |
|
if (fullxf(&ins->x, o->oargs.nsargs-1, |
134 |
|
if (o->os == NULL) |
135 |
|
return; |
136 |
|
freescene((*(INSTANCE *)o->os).obj); |
137 |
< |
free(o->os); |
137 |
> |
free((void *)o->os); |
138 |
|
o->os = NULL; |
139 |
|
} |