diff options
Diffstat (limited to 'src/engine/world.h')
| -rw-r--r-- | src/engine/world.h | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/src/engine/world.h b/src/engine/world.h index 9c8c502..ef4a5e6 100644 --- a/src/engine/world.h +++ b/src/engine/world.h @@ -1,46 +1,46 @@ -enum // hardcoded texture numbers +enum // hardcoded texture numbers { - DEFAULT_SKY = 0, - DEFAULT_GEOM + DEFAULT_SKY = 0, + DEFAULT_GEOM }; -#define MAPVERSION 33 // bump if map format changes, see worldio.cpp +#define MAPVERSION 34 // bump if map format changes, see worldio.cpp struct octaheader { - char magic[4]; // "OCTA" - int version; // any >8bit quantity is little endian - int headersize; // sizeof(header) - int worldsize; - int numents; - int numpvs; - int lightmaps; - int blendmap; - int numvars; - int numvslots; + char magic[4]; // "OCTA" + int version; // any >8bit quantity is little endian + int headersize; // sizeof(header) + int worldsize; + int numents; + int numpvs; + int lightmaps; + int blendmap; + int numvars; + int numvslots; }; -struct compatheader // map file format header +struct compatheader // map file format header { - char magic[4]; // "OCTA" - int version; // any >8bit quantity is little endian - int headersize; // sizeof(header) - int worldsize; - int numents; - int numpvs; - int lightmaps; - int lightprecision, lighterror, lightlod; - uchar ambient; - uchar watercolour[3]; - uchar blendmap; - uchar lerpangle, lerpsubdiv, lerpsubdivsize; - uchar bumperror; - uchar skylight[3]; - uchar lavacolour[3]; - uchar waterfallcolour[3]; - uchar reserved[10]; - char maptitle[128]; + char magic[4]; // "OCTA" + int version; // any >8bit quantity is little endian + int headersize; // sizeof(header) + int worldsize; + int numents; + int numpvs; + int lightmaps; + int lightprecision, lighterror, lightlod; + uchar ambient; + uchar watercolour[3]; + uchar blendmap; + uchar lerpangle, lerpsubdiv, lerpsubdivsize; + uchar bumperror; + uchar skylight[3]; + uchar lavacolour[3]; + uchar waterfallcolour[3]; + uchar reserved[10]; + char maptitle[128]; }; #define WATER_AMPLITUDE 0.4f @@ -48,9 +48,9 @@ struct compatheader // map file format header enum { - MATSURF_NOT_VISIBLE = 0, - MATSURF_VISIBLE, - MATSURF_EDIT_ONLY + MATSURF_NOT_VISIBLE = 0, + MATSURF_VISIBLE, + MATSURF_EDIT_ONLY }; #define TEX_SCALE 8.0f |