olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qbsp3: add "q2_" prefix to some types

This commit is contained in:
Eric Wasylishen 2017-09-24 16:29:21 -06:00
parent f9276c62ec
commit 69f502f7a3
6 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
qbsp3/common/bspfile.c
View File

@ -30,7 +30,7 @@ void GetLeafNums (void);
//============================================================================= //=============================================================================
int nummodels; int nummodels;
dmodel_t dmodels[MAX_MAP_MODELS]; q2_dmodel_t dmodels[MAX_MAP_MODELS];
int visdatasize; int visdatasize;
byte dvisdata[MAX_MAP_VISIBILITY]; byte dvisdata[MAX_MAP_VISIBILITY];
@ -43,7 +43,7 @@ int entdatasize;
char dentdata[MAX_MAP_ENTSTRING]; char dentdata[MAX_MAP_ENTSTRING];
int numleafs; int numleafs;
dleaf_t dleafs[MAX_MAP_LEAFS]; q2_dleaf_t dleafs[MAX_MAP_LEAFS];
int numplanes; int numplanes;
dplane_t dplanes[MAX_MAP_PLANES]; dplane_t dplanes[MAX_MAP_PLANES];
@ -52,16 +52,16 @@ int numvertexes;
dvertex_t dvertexes[MAX_MAP_VERTS]; dvertex_t dvertexes[MAX_MAP_VERTS];
int numnodes; int numnodes;
dnode_t dnodes[MAX_MAP_NODES]; q2_dnode_t dnodes[MAX_MAP_NODES];
int numtexinfo; int numtexinfo;
texinfo_t texinfo[MAX_MAP_TEXINFO]; q2_texinfo_t texinfo[MAX_MAP_TEXINFO];
int numfaces; int numfaces;
dface_t dfaces[MAX_MAP_FACES]; q2_dface_t dfaces[MAX_MAP_FACES];
int numedges; int numedges;
dedge_t dedges[MAX_MAP_EDGES]; q2_dedge_t dedges[MAX_MAP_EDGES];
int numleaffaces; int numleaffaces;
unsigned short dleaffaces[MAX_MAP_LEAFFACES]; unsigned short dleaffaces[MAX_MAP_LEAFFACES];
@ -170,7 +170,7 @@ Byte swaps all data in a bsp file.
void SwapBSPFile (qboolean todisk) void SwapBSPFile (qboolean todisk)
{ {
int i, j; int i, j;
dmodel_t *d; q2_dmodel_t *d;
// models // models
@ -392,17 +392,17 @@ void LoadBSPFile (char *filename)
if (header->version != BSPVERSION) if (header->version != BSPVERSION)
Error ("%s is version %i, not %i", filename, header->version, BSPVERSION); Error ("%s is version %i, not %i", filename, header->version, BSPVERSION);
nummodels = CopyLump (LUMP_MODELS, dmodels, sizeof(dmodel_t)); nummodels = CopyLump (LUMP_MODELS, dmodels, sizeof(q2_dmodel_t));
numvertexes = CopyLump (LUMP_VERTEXES, dvertexes, sizeof(dvertex_t)); numvertexes = CopyLump (LUMP_VERTEXES, dvertexes, sizeof(dvertex_t));
numplanes = CopyLump (LUMP_PLANES, dplanes, sizeof(dplane_t)); numplanes = CopyLump (LUMP_PLANES, dplanes, sizeof(dplane_t));
numleafs = CopyLump (LUMP_LEAFS, dleafs, sizeof(dleaf_t)); numleafs = CopyLump (LUMP_LEAFS, dleafs, sizeof(q2_dleaf_t));
numnodes = CopyLump (LUMP_NODES, dnodes, sizeof(dnode_t)); numnodes = CopyLump (LUMP_NODES, dnodes, sizeof(q2_dnode_t));
numtexinfo = CopyLump (LUMP_TEXINFO, texinfo, sizeof(texinfo_t)); numtexinfo = CopyLump (LUMP_TEXINFO, texinfo, sizeof(q2_texinfo_t));
numfaces = CopyLump (LUMP_FACES, dfaces, sizeof(dface_t)); numfaces = CopyLump (LUMP_FACES, dfaces, sizeof(q2_dface_t));
numleaffaces = CopyLump (LUMP_LEAFFACES, dleaffaces, sizeof(dleaffaces[0])); numleaffaces = CopyLump (LUMP_LEAFFACES, dleaffaces, sizeof(dleaffaces[0]));
numleafbrushes = CopyLump (LUMP_LEAFBRUSHES, dleafbrushes, sizeof(dleafbrushes[0])); numleafbrushes = CopyLump (LUMP_LEAFBRUSHES, dleafbrushes, sizeof(dleafbrushes[0]));
numsurfedges = CopyLump (LUMP_SURFEDGES, dsurfedges, sizeof(dsurfedges[0])); numsurfedges = CopyLump (LUMP_SURFEDGES, dsurfedges, sizeof(dsurfedges[0]));
numedges = CopyLump (LUMP_EDGES, dedges, sizeof(dedge_t)); numedges = CopyLump (LUMP_EDGES, dedges, sizeof(q2_dedge_t));
numbrushes = CopyLump (LUMP_BRUSHES, dbrushes, sizeof(dbrush_t)); numbrushes = CopyLump (LUMP_BRUSHES, dbrushes, sizeof(dbrush_t));
numbrushsides = CopyLump (LUMP_BRUSHSIDES, dbrushsides, sizeof(dbrushside_t)); numbrushsides = CopyLump (LUMP_BRUSHSIDES, dbrushsides, sizeof(dbrushside_t));
numareas = CopyLump (LUMP_AREAS, dareas, sizeof(darea_t)); numareas = CopyLump (LUMP_AREAS, dareas, sizeof(darea_t));
@ -458,7 +458,7 @@ void LoadBSPFileTexinfo (char *filename)
fread (texinfo, length, 1, f); fread (texinfo, length, 1, f);
fclose (f); fclose (f);
numtexinfo = length / sizeof(texinfo_t); numtexinfo = length / sizeof(q2_texinfo_t);
free (header); // everything has been copied out free (header); // everything has been copied out
@ -503,18 +503,18 @@ void WriteBSPFile (char *filename)
SafeWrite (wadfile, header, sizeof(dheader_t)); // overwritten later SafeWrite (wadfile, header, sizeof(dheader_t)); // overwritten later
AddLump (LUMP_PLANES, dplanes, numplanes*sizeof(dplane_t)); AddLump (LUMP_PLANES, dplanes, numplanes*sizeof(dplane_t));
AddLump (LUMP_LEAFS, dleafs, numleafs*sizeof(dleaf_t)); AddLump (LUMP_LEAFS, dleafs, numleafs*sizeof(q2_dleaf_t));
AddLump (LUMP_VERTEXES, dvertexes, numvertexes*sizeof(dvertex_t)); AddLump (LUMP_VERTEXES, dvertexes, numvertexes*sizeof(dvertex_t));
AddLump (LUMP_NODES, dnodes, numnodes*sizeof(dnode_t)); AddLump (LUMP_NODES, dnodes, numnodes*sizeof(q2_dnode_t));
AddLump (LUMP_TEXINFO, texinfo, numtexinfo*sizeof(texinfo_t)); AddLump (LUMP_TEXINFO, texinfo, numtexinfo*sizeof(q2_texinfo_t));
AddLump (LUMP_FACES, dfaces, numfaces*sizeof(dface_t)); AddLump (LUMP_FACES, dfaces, numfaces*sizeof(q2_dface_t));
AddLump (LUMP_BRUSHES, dbrushes, numbrushes*sizeof(dbrush_t)); AddLump (LUMP_BRUSHES, dbrushes, numbrushes*sizeof(dbrush_t));
AddLump (LUMP_BRUSHSIDES, dbrushsides, numbrushsides*sizeof(dbrushside_t)); AddLump (LUMP_BRUSHSIDES, dbrushsides, numbrushsides*sizeof(dbrushside_t));
AddLump (LUMP_LEAFFACES, dleaffaces, numleaffaces*sizeof(dleaffaces[0])); AddLump (LUMP_LEAFFACES, dleaffaces, numleaffaces*sizeof(dleaffaces[0]));
AddLump (LUMP_LEAFBRUSHES, dleafbrushes, numleafbrushes*sizeof(dleafbrushes[0])); AddLump (LUMP_LEAFBRUSHES, dleafbrushes, numleafbrushes*sizeof(dleafbrushes[0]));
AddLump (LUMP_SURFEDGES, dsurfedges, numsurfedges*sizeof(dsurfedges[0])); AddLump (LUMP_SURFEDGES, dsurfedges, numsurfedges*sizeof(dsurfedges[0]));
AddLump (LUMP_EDGES, dedges, numedges*sizeof(dedge_t)); AddLump (LUMP_EDGES, dedges, numedges*sizeof(q2_dedge_t));
AddLump (LUMP_MODELS, dmodels, nummodels*sizeof(dmodel_t)); AddLump (LUMP_MODELS, dmodels, nummodels*sizeof(q2_dmodel_t));
AddLump (LUMP_AREAS, dareas, numareas*sizeof(darea_t)); AddLump (LUMP_AREAS, dareas, numareas*sizeof(darea_t));
AddLump (LUMP_AREAPORTALS, dareaportals, numareaportals*sizeof(dareaportal_t)); AddLump (LUMP_AREAPORTALS, dareaportals, numareaportals*sizeof(dareaportal_t));
@ -543,7 +543,7 @@ void PrintBSPFileSizes (void)
ParseEntities (); ParseEntities ();
printf ("%5i models %7i\n" printf ("%5i models %7i\n"
,nummodels, (int)(nummodels*sizeof(dmodel_t))); ,nummodels, (int)(nummodels*sizeof(q2_dmodel_t)));
printf ("%5i brushes %7i\n" printf ("%5i brushes %7i\n"
,numbrushes, (int)(numbrushes*sizeof(dbrush_t))); ,numbrushes, (int)(numbrushes*sizeof(dbrush_t)));
printf ("%5i brushsides %7i\n" printf ("%5i brushsides %7i\n"
@ -551,7 +551,7 @@ void PrintBSPFileSizes (void)
printf ("%5i planes %7i\n" printf ("%5i planes %7i\n"
,numplanes, (int)(numplanes*sizeof(dplane_t))); ,numplanes, (int)(numplanes*sizeof(dplane_t)));
printf ("%5i texinfo %7i\n" printf ("%5i texinfo %7i\n"
,numtexinfo, (int)(numtexinfo*sizeof(texinfo_t))); ,numtexinfo, (int)(numtexinfo*sizeof(q2_texinfo_t)));
printf ("%5i entdata %7i\n", num_entities, entdatasize); printf ("%5i entdata %7i\n", num_entities, entdatasize);
printf ("\n"); printf ("\n");
@ -559,11 +559,11 @@ void PrintBSPFileSizes (void)
printf ("%5i vertexes %7i\n" printf ("%5i vertexes %7i\n"
,numvertexes, (int)(numvertexes*sizeof(dvertex_t))); ,numvertexes, (int)(numvertexes*sizeof(dvertex_t)));
printf ("%5i nodes %7i\n" printf ("%5i nodes %7i\n"
,numnodes, (int)(numnodes*sizeof(dnode_t))); ,numnodes, (int)(numnodes*sizeof(q2_dnode_t)));
printf ("%5i faces %7i\n" printf ("%5i faces %7i\n"
,numfaces, (int)(numfaces*sizeof(dface_t))); ,numfaces, (int)(numfaces*sizeof(q2_dface_t)));
printf ("%5i leafs %7i\n" printf ("%5i leafs %7i\n"
,numleafs, (int)(numleafs*sizeof(dleaf_t))); ,numleafs, (int)(numleafs*sizeof(q2_dleaf_t)));
printf ("%5i leaffaces %7i\n" printf ("%5i leaffaces %7i\n"
,numleaffaces, (int)(numleaffaces*sizeof(dleaffaces[0]))); ,numleaffaces, (int)(numleaffaces*sizeof(dleaffaces[0])));
printf ("%5i leafbrushes %7i\n" printf ("%5i leafbrushes %7i\n"
@ -571,7 +571,7 @@ void PrintBSPFileSizes (void)
printf ("%5i surfedges %7i\n" printf ("%5i surfedges %7i\n"
,numsurfedges, (int)(numsurfedges*sizeof(dsurfedges[0]))); ,numsurfedges, (int)(numsurfedges*sizeof(dsurfedges[0])));
printf ("%5i edges %7i\n" printf ("%5i edges %7i\n"
,numedges, (int)(numedges*sizeof(dedge_t))); ,numedges, (int)(numedges*sizeof(q2_dedge_t)));
printf (" lightdata %7i\n", lightdatasize); printf (" lightdata %7i\n", lightdatasize);
printf (" visdata %7i\n", visdatasize); printf (" visdata %7i\n", visdatasize);
} }

12
qbsp3/common/bspfile.h
View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
extern int nummodels; extern int nummodels;
extern dmodel_t dmodels[MAX_MAP_MODELS]; extern q2_dmodel_t dmodels[MAX_MAP_MODELS];
extern int visdatasize; extern int visdatasize;
extern byte dvisdata[MAX_MAP_VISIBILITY]; extern byte dvisdata[MAX_MAP_VISIBILITY];
@ -37,7 +37,7 @@ extern int entdatasize;
extern char dentdata[MAX_MAP_ENTSTRING]; extern char dentdata[MAX_MAP_ENTSTRING];
extern int numleafs; extern int numleafs;
extern dleaf_t dleafs[MAX_MAP_LEAFS]; extern q2_dleaf_t dleafs[MAX_MAP_LEAFS];
extern int numplanes; extern int numplanes;
extern dplane_t dplanes[MAX_MAP_PLANES]; extern dplane_t dplanes[MAX_MAP_PLANES];
@ -46,16 +46,16 @@ extern int numvertexes;
extern dvertex_t dvertexes[MAX_MAP_VERTS]; extern dvertex_t dvertexes[MAX_MAP_VERTS];
extern int numnodes; extern int numnodes;
extern dnode_t dnodes[MAX_MAP_NODES]; extern q2_dnode_t dnodes[MAX_MAP_NODES];
extern int numtexinfo; extern int numtexinfo;
extern texinfo_t texinfo[MAX_MAP_TEXINFO]; extern q2_texinfo_t texinfo[MAX_MAP_TEXINFO];
extern int numfaces; extern int numfaces;
extern dface_t dfaces[MAX_MAP_FACES]; extern q2_dface_t dfaces[MAX_MAP_FACES];
extern int numedges; extern int numedges;
extern dedge_t dedges[MAX_MAP_EDGES]; extern q2_dedge_t dedges[MAX_MAP_EDGES];
extern int numleaffaces; extern int numleaffaces;
extern unsigned short dleaffaces[MAX_MAP_LEAFFACES]; extern unsigned short dleaffaces[MAX_MAP_LEAFFACES];

12
qbsp3/common/qfiles.h
View File

@ -296,7 +296,7 @@ typedef struct
int headnode; int headnode;
int firstface, numfaces; // submodels just draw faces int firstface, numfaces; // submodels just draw faces
// without walking the bsp tree // without walking the bsp tree
} dmodel_t; } q2_dmodel_t;
typedef struct typedef struct
@ -390,7 +390,7 @@ typedef struct
short maxs[3]; short maxs[3];
unsigned short firstface; unsigned short firstface;
unsigned short numfaces; // counting both sides unsigned short numfaces; // counting both sides
} dnode_t; } q2_dnode_t;
typedef struct texinfo_s typedef struct texinfo_s
@ -400,7 +400,7 @@ typedef struct texinfo_s
int value; // light emission, etc int value; // light emission, etc
char texture[32]; // texture name (textures/*.wal) char texture[32]; // texture name (textures/*.wal)
int nexttexinfo; // for animations, -1 = end of chain int nexttexinfo; // for animations, -1 = end of chain
} texinfo_t; } q2_texinfo_t;
// 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
@ -408,7 +408,7 @@ typedef struct texinfo_s
typedef struct typedef struct
{ {
unsigned short v[2]; // vertex numbers unsigned short v[2]; // vertex numbers
} dedge_t; } q2_dedge_t;
#define MAXLIGHTMAPS 4 #define MAXLIGHTMAPS 4
typedef struct typedef struct
@ -423,7 +423,7 @@ typedef struct
// lighting info // lighting info
byte styles[MAXLIGHTMAPS]; byte styles[MAXLIGHTMAPS];
int lightofs; // start of [numstyles*surfsize] samples int lightofs; // start of [numstyles*surfsize] samples
} dface_t; } q2_dface_t;
typedef struct typedef struct
{ {
@ -440,7 +440,7 @@ typedef struct
unsigned short firstleafbrush; unsigned short firstleafbrush;
unsigned short numleafbrushes; unsigned short numleafbrushes;
} dleaf_t; } q2_dleaf_t;
typedef struct typedef struct
{ {

4
qbsp3/faces.c
View File

@ -628,7 +628,7 @@ Don't allow four way edges
*/ */
int GetEdge2 (int v1, int v2, face_t *f) int GetEdge2 (int v1, int v2, face_t *f)
{ {
dedge_t *edge; q2_dedge_t *edge;
int i; int i;
c_tryedges++; c_tryedges++;
@ -877,7 +877,7 @@ void SubdivideFace (node_t *node, face_t *f)
float mins, maxs; float mins, maxs;
vec_t v; vec_t v;
int axis, i; int axis, i;
texinfo_t *tex; q2_texinfo_t *tex;
vec3_t temp; vec3_t temp;
vec_t dist; vec_t dist;
winding_t *w, *frontw, *backw; winding_t *w, *frontw, *backw;

2
qbsp3/textures.c
View File

@ -109,7 +109,7 @@ int TexinfoForBrushTexture (plane_t *plane, brush_texture_t *bt, vec3_t origin)
int sv, tv; int sv, tv;
vec_t ang, sinv, cosv; vec_t ang, sinv, cosv;
vec_t ns, nt; vec_t ns, nt;
texinfo_t tx, *tc; q2_texinfo_t tx, *tc;
int i, j, k; int i, j, k;
float shift[2]; float shift[2];
brush_texture_t anim; brush_texture_t anim;

12
qbsp3/writebsp.c
View File

@ -65,7 +65,7 @@ void EmitPlanes (void)
//======================================================== //========================================================
void EmitMarkFace (dleaf_t *leaf_p, face_t *f) void EmitMarkFace (q2_dleaf_t *leaf_p, face_t *f)
{ {
int i; int i;
int facenum; int facenum;
@ -108,7 +108,7 @@ EmitLeaf
*/ */
void EmitLeaf (node_t *node) void EmitLeaf (node_t *node)
{ {
dleaf_t *leaf_p; q2_dleaf_t *leaf_p;
portal_t *p; portal_t *p;
int s; int s;
face_t *f; face_t *f;
@ -183,7 +183,7 @@ EmitFace
*/ */
void EmitFace (face_t *f) void EmitFace (face_t *f)
{ {
dface_t *df; q2_dface_t *df;
int i; int i;
int e; int e;
@ -231,7 +231,7 @@ EmitDrawingNode_r
*/ */
int EmitDrawNode_r (node_t *node) int EmitDrawNode_r (node_t *node)
{ {
dnode_t *n; q2_dnode_t *n;
face_t *f; face_t *f;
int i; int i;
@ -532,7 +532,7 @@ extern int firstmodeledge;
extern int firstmodelface; extern int firstmodelface;
void BeginModel (void) void BeginModel (void)
{ {
dmodel_t *mod; q2_dmodel_t *mod;
int start, end; int start, end;
mapbrush_t *b; mapbrush_t *b;
int j; int j;
@ -579,7 +579,7 @@ EndModel
*/ */
void EndModel (void) void EndModel (void)
{ {
dmodel_t *mod; q2_dmodel_t *mod;
mod = &dmodels[nummodels]; mod = &dmodels[nummodels];