mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-21 19:51:18 +00:00
Include qtypes.h, caused a problem here
This commit is contained in:
parent
a91a554830
commit
20784c33fd
1 changed files with 19 additions and 33 deletions
|
@ -25,10 +25,10 @@
|
||||||
|
|
||||||
$Id$
|
$Id$
|
||||||
*/
|
*/
|
||||||
|
#ifndef __bspfile_h_
|
||||||
|
#define __bspfile_h_
|
||||||
|
|
||||||
|
#include "qtypes.h"
|
||||||
#ifndef _BSPFILE_H
|
|
||||||
#define _BSPFILE_H
|
|
||||||
|
|
||||||
// upper design bounds
|
// upper design bounds
|
||||||
|
|
||||||
|
@ -64,9 +64,9 @@
|
||||||
|
|
||||||
#define BSPVERSION 29
|
#define BSPVERSION 29
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
int fileofs;
|
||||||
int fileofs, filelen;
|
int filelen;
|
||||||
} lump_t;
|
} lump_t;
|
||||||
|
|
||||||
#define LUMP_ENTITIES 0
|
#define LUMP_ENTITIES 0
|
||||||
|
@ -87,8 +87,7 @@ typedef struct
|
||||||
|
|
||||||
#define HEADER_LUMPS 15
|
#define HEADER_LUMPS 15
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
float mins[3], maxs[3];
|
float mins[3], maxs[3];
|
||||||
float origin[3];
|
float origin[3];
|
||||||
int headnode[MAX_MAP_HULLS];
|
int headnode[MAX_MAP_HULLS];
|
||||||
|
@ -96,29 +95,25 @@ typedef struct
|
||||||
int firstface, numfaces;
|
int firstface, numfaces;
|
||||||
} dmodel_t;
|
} dmodel_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
int version;
|
int version;
|
||||||
lump_t lumps[HEADER_LUMPS];
|
lump_t lumps[HEADER_LUMPS];
|
||||||
} dheader_t;
|
} dheader_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
int nummiptex;
|
int nummiptex;
|
||||||
int dataofs[4]; // [nummiptex]
|
int dataofs[4]; // [nummiptex]
|
||||||
} dmiptexlump_t;
|
} dmiptexlump_t;
|
||||||
|
|
||||||
#define MIPLEVELS 4
|
#define MIPLEVELS 4
|
||||||
typedef struct miptex_s
|
typedef struct miptex_s {
|
||||||
{
|
|
||||||
char name[16];
|
char name[16];
|
||||||
unsigned int width, height;
|
unsigned int width, height;
|
||||||
unsigned int offsets[MIPLEVELS]; // four mip maps stored
|
unsigned int offsets[MIPLEVELS]; // four mip maps stored
|
||||||
} miptex_t;
|
} miptex_t;
|
||||||
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
float point[3];
|
float point[3];
|
||||||
} dvertex_t;
|
} dvertex_t;
|
||||||
|
|
||||||
|
@ -133,15 +128,12 @@ typedef struct
|
||||||
#define PLANE_ANYY 4
|
#define PLANE_ANYY 4
|
||||||
#define PLANE_ANYZ 5
|
#define PLANE_ANYZ 5
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
float normal[3];
|
float normal[3];
|
||||||
float dist;
|
float dist;
|
||||||
int type; // PLANE_X - PLANE_ANYZ ?remove? trivial to regenerate
|
int type; // PLANE_X - PLANE_ANYZ ?remove? trivial to regenerate
|
||||||
} dplane_t;
|
} dplane_t;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define CONTENTS_EMPTY -1
|
#define CONTENTS_EMPTY -1
|
||||||
#define CONTENTS_SOLID -2
|
#define CONTENTS_SOLID -2
|
||||||
#define CONTENTS_WATER -3
|
#define CONTENTS_WATER -3
|
||||||
|
@ -150,8 +142,7 @@ typedef struct
|
||||||
#define CONTENTS_SKY -6
|
#define CONTENTS_SKY -6
|
||||||
|
|
||||||
// !!! if this is changed, it must be changed in asm_i386.h too !!!
|
// !!! if this is changed, it must be changed in asm_i386.h too !!!
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
int planenum;
|
int planenum;
|
||||||
short children[2]; // negative numbers are -(leafs+1), not nodes
|
short children[2]; // negative numbers are -(leafs+1), not nodes
|
||||||
short mins[3]; // for sphere culling
|
short mins[3]; // for sphere culling
|
||||||
|
@ -160,15 +151,13 @@ typedef struct
|
||||||
unsigned short numfaces; // counting both sides
|
unsigned short numfaces; // counting both sides
|
||||||
} dnode_t;
|
} dnode_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
int planenum;
|
int planenum;
|
||||||
short children[2]; // negative numbers are contents
|
short children[2]; // negative numbers are contents
|
||||||
} dclipnode_t;
|
} dclipnode_t;
|
||||||
|
|
||||||
|
|
||||||
typedef struct texinfo_s
|
typedef struct texinfo_s {
|
||||||
{
|
|
||||||
float vecs[2][4]; // [s/t][xyz offset]
|
float vecs[2][4]; // [s/t][xyz offset]
|
||||||
int miptex;
|
int miptex;
|
||||||
int flags;
|
int flags;
|
||||||
|
@ -177,14 +166,12 @@ typedef struct texinfo_s
|
||||||
|
|
||||||
// note that edge 0 is never used, because negative edge nums are used for
|
// note that edge 0 is never used, because negative edge nums are used for
|
||||||
// counterclockwise use of the edge in a face
|
// counterclockwise use of the edge in a face
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
unsigned short v[2]; // vertex numbers
|
unsigned short v[2]; // vertex numbers
|
||||||
} dedge_t;
|
} dedge_t;
|
||||||
|
|
||||||
#define MAXLIGHTMAPS 4
|
#define MAXLIGHTMAPS 4
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
short planenum;
|
short planenum;
|
||||||
short side;
|
short side;
|
||||||
|
|
||||||
|
@ -208,8 +195,7 @@ typedef struct
|
||||||
|
|
||||||
// leaf 0 is the generic CONTENTS_SOLID leaf, used for all solid areas
|
// leaf 0 is the generic CONTENTS_SOLID leaf, used for all solid areas
|
||||||
// all other leafs need visibility info
|
// all other leafs need visibility info
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
int contents;
|
int contents;
|
||||||
int visofs; // -1 = no visibility info
|
int visofs; // -1 = no visibility info
|
||||||
|
|
||||||
|
@ -279,4 +265,4 @@ void WriteBSPFile (char *filename);
|
||||||
void PrintBSPFileSizes (void);
|
void PrintBSPFileSizes (void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif // _BSPFILE_H
|
#endif // __bspfile_h_
|
||||||
|
|
Loading…
Reference in a new issue