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

qbsp: pass hullnum into Brush_LoadEntity() 

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-02-18 09:51:33 +10:30
parent 9e4f207d3e
commit ef4e53b735
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qbsp/brush.c
View File

@ -355,7 +355,7 @@ CreateBrushFaces
=================
*/
static face_t *
CreateBrushFaces(hullbrush_t *hullbrush, mapentity_t *ent)
CreateBrushFaces(hullbrush_t *hullbrush, mapentity_t *ent, const int hullnum)
{
int i, j, k;
vec_t r;
@ -762,7 +762,7 @@ Converts a mapbrush to a bsp brush
===============
*/
static brush_t *
LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush)
LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush, const int hullnum)
{
hullbrush_t hullbrush;
brush_t *brush;
@ -804,7 +804,7 @@ LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush)
hullbrush.numfaces = mapbrush->numfaces;
memcpy(hullbrush.faces, mapface, mapbrush->numfaces * sizeof(mapface_t));
facelist = CreateBrushFaces(&hullbrush, ent);
facelist = CreateBrushFaces(&hullbrush, ent, hullnum);
if (!facelist) {
Message(msgWarning, warnNoBrushFaces);
return NULL;
@ -815,13 +815,13 @@ LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush)
ExpandBrush(&hullbrush, size, facelist);
FreeBrushFaces(facelist);
facelist = CreateBrushFaces(&hullbrush, ent);
facelist = CreateBrushFaces(&hullbrush, ent, hullnum);
} else if (hullnum == 2) {
vec3_t size[2] = { {-32, -32, -64}, {32, 32, 24} };
ExpandBrush(&hullbrush, size, facelist);
FreeBrushFaces(facelist);
facelist = CreateBrushFaces(&hullbrush, ent);
facelist = CreateBrushFaces(&hullbrush, ent, hullnum);
}
// create the brush
@ -844,7 +844,7 @@ Brush_LoadEntity
============
*/
void
Brush_LoadEntity(mapentity_t *ent)
Brush_LoadEntity(mapentity_t *ent, const int hullnum)
{
brush_t *brush, *next, *water, *other;
mapbrush_t *mapbrush;
@ -861,7 +861,7 @@ Brush_LoadEntity(mapentity_t *ent)
mapbrush = ent->mapbrushes;
ent->numbrushes = 0;
for (i = 0; i < ent->nummapbrushes; i++, mapbrush++) {
brush = LoadBrush(ent, mapbrush);
brush = LoadBrush(ent, mapbrush, hullnum);
if (!brush)
continue;

2
qbsp/qbsp.c
View File

@ -59,7 +59,7 @@ ProcessEntity(mapentity_t *ent)
}
// take the brush_ts and clip off all overlapping and contained faces,
// leaving a perfect skin of the model with no hidden faces
Brush_LoadEntity(ent);
Brush_LoadEntity(ent, hullnum);
if (!ent->brushes) {
PrintEntity(ent);

2
qbsp/qbsp.h
View File

@ -637,7 +637,7 @@ void GetVectorForKey(const mapentity_t *ent, const char *szKey, vec3_t vec);
void WriteEntitiesToString(void);
void FixRotateOrigin(mapentity_t *ent);
void Brush_LoadEntity(mapentity_t *ent);
void Brush_LoadEntity(mapentity_t *ent, const int hullnum);
surface_t *CSGFaces(const mapentity_t *ent);
void PortalizeWorld(const mapentity_t *ent, node_t *headnode);
void TJunc(const mapentity_t *ent, node_t *headnode);