qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-22 02:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor cleanup: LoadBSP really shouldn't be doing the bsp2prt stuff :)

Browse source
This commit is contained in:
Bill Currie 2004-01-13 03:02:25 +00:00
parent 15870757e4
commit c31c97a6d9
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfbsp/include/bsp5.h
View file

@ -245,6 +245,7 @@ qboolean FillOutside (node_t *node);
// readbsp.c ==================================================================
void LoadBSP (void);
void bsp2prt (void);
//=============================================================================

1
tools/qfbsp/source/qfbsp.c
View file

@ -767,6 +767,7 @@ ProcessFile (void)
bsp = BSP_New ();
if (options.portal) {
LoadBSP ();
bsp2prt ();
return;
}

31
tools/qfbsp/source/readbsp.c
View file

@ -61,7 +61,6 @@ dvertex_t *vertices;
dedge_t *edges;
int *surfedges;
unsigned short *marksurfaces;
plane_t *mplanes;
static brushset_t bs;
static void
@ -98,13 +97,14 @@ load_planes (void)
dplane_t *p;
int i;
mplanes = malloc (bsp->numplanes * sizeof (plane_t));
memset (planes, 0, sizeof (planes));
for (i = 0; i < bsp->numplanes; i++) {
p = bsp->planes + i;
VectorCopy (p->normal, mplanes[i].normal);
mplanes[i].dist = p->dist;
mplanes[i].type = p->type;
VectorCopy (p->normal, planes[i].normal);
planes[i].dist = p->dist;
planes[i].type = p->type;
}
numbrushplanes = bsp->numplanes;
}
static void
@ -218,7 +218,6 @@ void
LoadBSP (void)
{
QFile *f;
vec3_t ooo = {1, 1, 1};
f = Qopen (options.bspfile, "rb");
if (!f)
@ -239,12 +238,16 @@ LoadBSP (void)
load_nodes ();
load_models ();
load_textures ();
memcpy (planes, mplanes, bsp->numplanes * sizeof (plane_t));
numbrushplanes = bsp->numplanes;
VectorSubtract (bsp->models[0].mins, ooo, bs.mins);
VectorAdd (bsp->models[0].maxs, ooo, bs.maxs);
brushset = &bs;
PortalizeWorld (nodes);
WritePortalfile (nodes);
}
void
bsp2prt (void)
{
vec3_t ooo = {1, 1, 1};
VectorSubtract (bsp->models[0].mins, ooo, bs.mins);
VectorAdd (bsp->models[0].maxs, ooo, bs.maxs);
brushset = &bs;
PortalizeWorld (nodes);
WritePortalfile (nodes);
}