12 |
|
#include <time.h> |
13 |
|
|
14 |
|
#include "platform.h" |
15 |
+ |
#include "paths.h" |
16 |
|
#include "resolu.h" |
17 |
|
#include "radogl.h" |
18 |
|
#include "octree.h" |
61 |
|
o->oargs.nsargs-1) |
62 |
|
objerror(o, USER, "bad transform"); |
63 |
|
glPushAttrib(GL_TRANSFORM_BIT); |
64 |
< |
if (xfs.sca < 1.-FTINY | xfs.sca > 1.+FTINY) |
64 |
> |
if ((xfs.sca < 1.-FTINY) | (xfs.sca > 1.+FTINY)) |
65 |
|
glEnable(GL_NORMALIZE); |
66 |
|
glMatrixMode(GL_MODELVIEW); |
67 |
|
glPushMatrix(); |
117 |
|
while (ottab.tsiz) { |
118 |
|
if (!levelsleft--) |
119 |
|
error(USER, "too many octree levels -- instance loop?"); |
120 |
< |
copystruct(&looptab, &ottab); |
120 |
> |
looptab = ottab; |
121 |
|
ottab.tsiz = 0; |
122 |
|
nocts += lu_doall(&looptab, buildoctlist); |
123 |
|
lu_done(&looptab); |
157 |
|
return(op); |
158 |
|
memerr: |
159 |
|
error(SYSTEM, "out of memory in getoct"); |
160 |
+ |
return NULL; /* pro forma return */ |
161 |
|
} |
162 |
|
|
163 |
|
|
340 |
|
/* get name id */ |
341 |
|
ob.oname = ogetstr(idbuf); |
342 |
|
/* get string arguments */ |
343 |
< |
if (ob.oargs.nsargs = ogetint(2)) { |
343 |
> |
if ((ob.oargs.nsargs = ogetint(2))) { |
344 |
|
ob.oargs.sarg = (char **)malloc |
345 |
|
(ob.oargs.nsargs*sizeof(char *)); |
346 |
|
if (ob.oargs.sarg == NULL) |
362 |
|
ob.oargs.iarg = NULL; |
363 |
|
#endif |
364 |
|
/* get real arguments */ |
365 |
< |
if (ob.oargs.nfargs = ogetint(2)) { |
365 |
> |
if ((ob.oargs.nfargs = ogetint(2))) { |
366 |
|
ob.oargs.farg = (RREAL *)malloc |
367 |
|
(ob.oargs.nfargs*sizeof(RREAL)); |
368 |
|
if (ob.oargs.farg == NULL) |
384 |
|
return(nobjects++); /* return object id */ |
385 |
|
memerr: |
386 |
|
error(SYSTEM, "out of memory in loadobj"); |
387 |
+ |
return OVOID; /* pro forma return */ |
388 |
|
} |
389 |
|
|
390 |
|
|