10 |
|
#include <stdio.h> |
11 |
|
#include <time.h> |
12 |
|
|
13 |
– |
#include "standard.h" |
13 |
|
#include "platform.h" |
14 |
+ |
#include "rtprocess.h" |
15 |
+ |
#include "standard.h" |
16 |
|
#include "octree.h" |
17 |
|
#include "object.h" |
18 |
|
#include "otypes.h" |
19 |
|
#include "resolu.h" |
20 |
|
|
21 |
< |
static double ogetflt(); |
22 |
< |
static long ogetint(); |
23 |
< |
static char *ogetstr(); |
24 |
< |
static int nonsurfinset(); |
21 |
> |
#ifdef getc_unlocked /* avoid horrendous overhead of flockfile */ |
22 |
> |
#define getc getc_unlocked |
23 |
> |
#endif |
24 |
> |
|
25 |
> |
static double ogetflt(void); |
26 |
> |
static long ogetint(int); |
27 |
> |
static char *ogetstr(char *); |
28 |
> |
static int nonsurfinset(OBJECT *); |
29 |
|
static void octerror(int etyp, char *msg); |
30 |
|
static void skiptree(void); |
31 |
< |
static OCTREE getfullnode(), gettree(); |
31 |
> |
static OCTREE getfullnode(void), gettree(void); |
32 |
|
|
33 |
|
static char *infn; /* input file specification */ |
34 |
|
static FILE *infp; /* input file stream */ |
104 |
|
else if (load & IO_SCENE && nf == 0) |
105 |
|
skiptree(); |
106 |
|
|
107 |
< |
if (load & IO_SCENE) /* get the scene */ |
107 |
> |
if (load & IO_SCENE) { /* get the scene */ |
108 |
|
if (nf == 0) { |
109 |
|
/* load binary scene data */ |
110 |
|
readscene(infp, objsize); |
117 |
|
if (dosets(nonsurfinset)) |
118 |
|
octerror(USER, "modifier in tree; octree stale?"); |
119 |
|
} |
120 |
+ |
} |
121 |
|
/* close the input */ |
122 |
|
if (infn[0] == '!') |
123 |
|
pclose(infp); |
206 |
|
default: |
207 |
|
octerror(USER, "damaged octree"); |
208 |
|
} |
209 |
< |
return NULL; /* pro forma return */ |
209 |
> |
return EMPTY; /* pro forma return */ |
210 |
|
} |
211 |
|
|
212 |
|
|