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

qbsp: replace FreeMem uses

This commit is contained in:
Eric Wasylishen 2021-08-24 22:49:06 -06:00
parent 1f7ac25f0c
commit 1123205d47
13 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qbsp/brush.cc
View File

@ -461,7 +461,7 @@ CreateBrushFaces(const mapentity_t *src, hullbrush_t *hullbrush,
VectorSubtract(point, rotate_offset, point); VectorSubtract(point, rotate_offset, point);
plane.dist = DotProduct(plane.normal, point); plane.dist = DotProduct(plane.normal, point);
FreeMem(w, WINDING, 1); free(w);
f->texinfo = hullnum ? 0 : mapface->texinfo; f->texinfo = hullnum ? 0 : mapface->texinfo;
f->planenum = FindPlane(plane.normal, plane.dist, &f->planeside); f->planenum = FindPlane(plane.normal, plane.dist, &f->planeside);
@ -518,7 +518,7 @@ FreeBrushFaces(face_t *facelist)
for (face = facelist; face; face = next) { for (face = facelist; face; face = next) {
next = face->next; next = face->next;
FreeMem(face, FACE, 1); free(face);
} }
} }
@ -549,7 +549,7 @@ void
FreeBrush(brush_t *brush) FreeBrush(brush_t *brush)
{ {
FreeBrushFaces(brush->faces); FreeBrushFaces(brush->faces);
FreeMem(brush, BRUSH, 1); free(brush);
} }
/* /*
@ -1614,7 +1614,7 @@ void SplitBrush (const brush_t *brush,
int side; int side;
if (w) if (w)
FreeMem(w, WINDING, 1); free(w);
side = BrushMostlyOnSide (brush, plane.normal, plane.dist); side = BrushMostlyOnSide (brush, plane.normal, plane.dist);
if (side == SIDE_FRONT) if (side == SIDE_FRONT)
@ -1684,9 +1684,9 @@ void SplitBrush (const brush_t *brush,
} }
if (cw[0]) if (cw[0])
FreeMem(cw[0], WINDING, 1); free(cw[0]);
if (cw[1]) if (cw[1])
FreeMem(cw[1], WINDING, 1); free(cw[1]);
} }
@ -1744,7 +1744,7 @@ void SplitBrush (const brush_t *brush,
CopyWindingInto(&newface->w, newwinding); CopyWindingInto(&newface->w, newwinding);
newface->planenum = planenum; newface->planenum = planenum;
newface->planeside = !planeside; newface->planeside = !planeside;
FreeMem(newwinding, WINDING, 1); free(newwinding);
} else { } else {
CopyWindingInto(&newface->w, midwinding); CopyWindingInto(&newface->w, midwinding);
newface->planenum = planenum; newface->planenum = planenum;
@ -1777,7 +1777,7 @@ void SplitBrush (const brush_t *brush,
*front = b[0]; *front = b[0];
*back = b[1]; *back = b[1];
FreeMem(midwinding, WINDING, 1); free(midwinding);
} }
#if 0 #if 0

6
qbsp/csg4.cc
View File

@ -214,7 +214,7 @@ SplitFace(face_t *in, const qbsp_plane_t *split, face_t **front, face_t **back)
Error("Internal error: numpoints > MAXEDGES (%s)", __func__); Error("Internal error: numpoints > MAXEDGES (%s)", __func__);
/* free the original face now that it is represented by the fragments */ /* free the original face now that it is represented by the fragments */
FreeMem(in, FACE, 1); free(in);
} }
/* /*
@ -252,7 +252,7 @@ RemoveOutsideFaces(const brush_t *brush, face_t **inside, face_t **outside)
} else { } else {
face->next = *inside; face->next = *inside;
*inside = face; *inside = face;
FreeMem(w, WINDING, 1); free(w);
} }
face = next; face = next;
} }
@ -414,7 +414,7 @@ FreeFaces(face_t *face)
while (face) { while (face) {
next = face->next; next = face->next;
FreeMem(face, FACE, 1); free(face);
face = next; face = next;
} }
} }

6
qbsp/map.cc
View File

@ -1928,7 +1928,7 @@ mapentity_t LoadExternalMap(const char *filename)
Message(msgStat, "LoadExternalMap: '%s': Loaded %d mapbrushes.\n", filename, dest.nummapbrushes); Message(msgStat, "LoadExternalMap: '%s': Loaded %d mapbrushes.\n", filename, dest.nummapbrushes);
FreeMem(buf, OTHER, length + 1); free(buf);
return dest; return dest;
} }
@ -1958,7 +1958,7 @@ LoadMapFile(void)
assert(map.entities.back().numbrushes == 0); assert(map.entities.back().numbrushes == 0);
map.entities.pop_back(); map.entities.pop_back();
FreeMem(buf, OTHER, length + 1); free(buf);
// Print out warnings for entities // Print out warnings for entities
if (!(rgfStartSpots & info_player_start)) if (!(rgfStartSpots & info_player_start))
@ -2325,7 +2325,7 @@ WriteBspBrushMap(const char *name, const std::vector<const brush_t *> &list)
fprintf (f, "notexture 0 0 0 1 1\n" ); fprintf (f, "notexture 0 0 0 1 1\n" );
FreeMem(w, WINDING, 1); free(w);
} }
fprintf (f, "}\n"); fprintf (f, "}\n");
} }

4
qbsp/merge.cc
View File

@ -187,7 +187,7 @@ MergeFaceToList(face_t *face, face_t *list)
#endif #endif
newf = TryMerge(face, f); newf = TryMerge(face, f);
if (newf) { if (newf) {
FreeMem(face, FACE, 1); free(face);
f->w.numpoints = -1; // merged out, remove later f->w.numpoints = -1; // merged out, remove later
face = newf; face = newf;
f = list; f = list;
@ -215,7 +215,7 @@ FreeMergeListScraps(face_t *merged)
for (; merged; merged = next) { for (; merged; merged = next) {
next = merged->next; next = merged->next;
if (merged->w.numpoints == -1) if (merged->w.numpoints == -1)
FreeMem(merged, FACE, 1); free(merged);
else { else {
merged->next = head; merged->next = head;
head = merged; head = merged;

10
qbsp/portals.cc
View File

@ -630,7 +630,7 @@ CutNodePortals_r(node_t *node, portal_state_t *state)
if (!frontwinding) { if (!frontwinding) {
if (backwinding) if (backwinding)
FreeMem(backwinding, WINDING, 1); free(backwinding);
if (side == 0) if (side == 0)
AddPortalToNodes(portal, back, other_node); AddPortalToNodes(portal, back, other_node);
@ -640,7 +640,7 @@ CutNodePortals_r(node_t *node, portal_state_t *state)
} }
if (!backwinding) { if (!backwinding) {
if (frontwinding) if (frontwinding)
FreeMem(frontwinding, WINDING, 1); free(frontwinding);
if (side == 0) if (side == 0)
AddPortalToNodes(portal, front, other_node); AddPortalToNodes(portal, front, other_node);
@ -653,7 +653,7 @@ CutNodePortals_r(node_t *node, portal_state_t *state)
new_portal = (portal_t *)AllocMem(OTHER, sizeof(portal_t), true); new_portal = (portal_t *)AllocMem(OTHER, sizeof(portal_t), true);
*new_portal = *portal; *new_portal = *portal;
new_portal->winding = backwinding; new_portal->winding = backwinding;
FreeMem(portal->winding, WINDING, 1); free(portal->winding);
portal->winding = frontwinding; portal->winding = frontwinding;
if (side == 0) { if (side == 0) {
@ -728,8 +728,8 @@ FreeAllPortals(node_t *node)
nextp = p->next[1]; nextp = p->next[1];
RemovePortalFromNode(p, p->nodes[0]); RemovePortalFromNode(p, p->nodes[0]);
RemovePortalFromNode(p, p->nodes[1]); RemovePortalFromNode(p, p->nodes[1]);
FreeMem(p->winding, WINDING, 1); free(p->winding);
FreeMem(p, PORTAL, 1); free(p);
} }
node->portals = NULL; node->portals = NULL;
} }

6
qbsp/qbsp.cc
View File

@ -621,7 +621,7 @@ EnsureTexturesLoaded()
wadlist = WADList_Init(defaultwad); wadlist = WADList_Init(defaultwad);
if (wadlist) if (wadlist)
Message(msgLiteral, "Using default WAD: %s\n", defaultwad); Message(msgLiteral, "Using default WAD: %s\n", defaultwad);
FreeMem(defaultwad, OTHER, strlen(options.szMapName) + 5); free(defaultwad);
} }
} }
@ -975,7 +975,7 @@ InitQBSP(int argc, const char **argv)
Message(msgLiteral, "Loading options from qbsp.ini\n"); Message(msgLiteral, "Loading options from qbsp.ini\n");
ParseOptions(szBuf); ParseOptions(szBuf);
FreeMem(szBuf, OTHER, length + 1); free(szBuf);
} }
// Concatenate command line args // Concatenate command line args
@ -998,7 +998,7 @@ InitQBSP(int argc, const char **argv)
} }
szBuf[length - 1] = 0; szBuf[length - 1] = 0;
ParseOptions(szBuf); ParseOptions(szBuf);
FreeMem(szBuf, OTHER, length); free(szBuf);
if (options.szMapName[0] == 0) if (options.szMapName[0] == 0)
PrintOptions(); PrintOptions();

8
qbsp/solidbsp.cc
View File

@ -633,12 +633,12 @@ DividePlane(surface_t *in, const qbsp_plane_t *split, surface_t **front,
if (in->faces) if (in->faces)
*front = in; *front = in;
else else
FreeMem(in, SURFACE, 1); free(in);
if (newsurf->faces) if (newsurf->faces)
*back = newsurf; *back = newsurf;
else else
FreeMem(newsurf, SURFACE, 1); free(newsurf);
return; return;
} }
@ -869,9 +869,9 @@ LinkConvexFaces(surface_t *planelist, node_t *leafnode)
next = f->next; next = f->next;
leafnode->markfaces[i] = f->original; leafnode->markfaces[i] = f->original;
i++; i++;
FreeMem(f, FACE, 1); free(f);
} }
FreeMem(surf, SURFACE, 1); free(surf);
} }
leafnode->markfaces[i] = NULL; // sentinal leafnode->markfaces[i] = NULL; // sentinal
} }

6
qbsp/surfaces.cc
View File

@ -139,7 +139,7 @@ GatherNodeFaces_r(node_t *node, std::map<int, face_t *> &planefaces)
for (f = node->faces; f; f = next) { for (f = node->faces; f; f = next) {
next = f->next; next = f->next;
if (!f->w.numpoints) { // face was removed outside if (!f->w.numpoints) { // face was removed outside
FreeMem(f, FACE, 1); free(f);
} else { } else {
f->next = planefaces[f->planenum]; f->next = planefaces[f->planenum];
planefaces[f->planenum] = f; planefaces[f->planenum] = f;
@ -148,7 +148,7 @@ GatherNodeFaces_r(node_t *node, std::map<int, face_t *> &planefaces)
GatherNodeFaces_r(node->children[0], planefaces); GatherNodeFaces_r(node->children[0], planefaces);
GatherNodeFaces_r(node->children[1], planefaces); GatherNodeFaces_r(node->children[1], planefaces);
} }
FreeMem(node, NODE, 1); free(node);
} }
/* /*
@ -417,7 +417,7 @@ EmitFace(mapentity_t *entity, face_t *face)
for (i = 0; i < face->w.numpoints; i++) { for (i = 0; i < face->w.numpoints; i++) {
map.exported_surfedges.push_back(face->edges[i]); map.exported_surfedges.push_back(face->edges[i]);
} }
FreeMem(face->edges, OTHER, face->w.numpoints * sizeof(int)); free(face->edges);
out->numedges = static_cast<int>(map.exported_surfedges.size()) - out->firstedge; out->numedges = static_cast<int>(map.exported_surfedges.size()) - out->firstedge;
} }

4
qbsp/test_qbsp.cc
View File

@ -269,8 +269,8 @@ TEST(qbsp, SplitBrush) {
checkCube(back); checkCube(back);
FreeBrush(brush); FreeBrush(brush);
FreeMem(front, BRUSH, 1); free(front);
FreeMem(back, BRUSH, 1); free(back);
} }
TEST(qbsp, SplitBrushOnSide) { TEST(qbsp, SplitBrushOnSide) {

6
qbsp/tjunc.cc
View File

@ -509,10 +509,10 @@ TJunc(const mapentity_t *entity, node_t *headnode)
tjuncs = tjuncfaces = 0; tjuncs = tjuncfaces = 0;
tjunc_fix_r(headnode, superface); tjunc_fix_r(headnode, superface);
FreeMem(superface, OTHER, superface_bytes); free(superface);
FreeMem(pWVerts, WVERT, cWVerts); free(pWVerts);
FreeMem(pWEdges, WEDGE, cWEdges); free(pWEdges);
Message(msgStat, "%8d edges added by tjunctions", tjuncs); Message(msgStat, "%8d edges added by tjunctions", tjuncs);
Message(msgStat, "%8d faces added by tjunctions", tjuncfaces); Message(msgStat, "%8d faces added by tjunctions", tjuncfaces);

4
qbsp/wad.cc
View File

@ -174,8 +174,8 @@ WADList_Free(wad_t *wadlist)
for (wad = wadlist; wad; wad = next) { for (wad = wadlist; wad; wad = next) {
next = wad->next; next = wad->next;
fclose(wad->file); fclose(wad->file);
FreeMem(wad->lumps, OTHER, sizeof(lumpinfo_t) * wad->header.numlumps); free(wad->lumps);
FreeMem(wad, OTHER, sizeof(*wad)); free(wad);
} }
} }

8
qbsp/winding.cc
View File

@ -204,7 +204,7 @@ ClipWinding(winding_t *in, const qbsp_plane_t *split, bool keepon)
return in; return in;
if (!counts[SIDE_FRONT]) { if (!counts[SIDE_FRONT]) {
FreeMem(in, WINDING, 1); free(in);
return NULL; return NULL;
} }
@ -254,7 +254,7 @@ ClipWinding(winding_t *in, const qbsp_plane_t *split, bool keepon)
VectorCopy(mid, neww->points[neww->numpoints]); VectorCopy(mid, neww->points[neww->numpoints]);
neww->numpoints++; neww->numpoints++;
} }
FreeMem(in, WINDING, 1); free(in);
return neww; return neww;
@ -459,7 +459,7 @@ void ChopWindingInPlace (winding_t **inout, const vec3_t normal, vec_t dist, vec
if (!counts[0]) if (!counts[0])
{ {
FreeMem (in, WINDING, 1); free(in);
*inout = nullptr; *inout = nullptr;
return; return;
} }
@ -514,7 +514,7 @@ void ChopWindingInPlace (winding_t **inout, const vec3_t normal, vec_t dist, vec
if (f->numpoints > MAX_POINTS_ON_WINDING) if (f->numpoints > MAX_POINTS_ON_WINDING)
Error ("ClipWinding: MAX_POINTS_ON_WINDING"); Error ("ClipWinding: MAX_POINTS_ON_WINDING");
FreeMem (in, WINDING, 1); free(in);
*inout = f; *inout = f;
} }

6
qbsp/writebsp.cc
View File

@ -129,7 +129,7 @@ ExportClipNodes_BSP29(mapentity_t *entity, node_t *node)
// FIXME: free more stuff? // FIXME: free more stuff?
if (node->planenum == -1) { if (node->planenum == -1) {
int contents = node->contents; int contents = node->contents;
FreeMem(node, NODE, 1); free(node);
return contents; return contents;
} }
@ -149,9 +149,9 @@ ExportClipNodes_BSP29(mapentity_t *entity, node_t *node)
for (face = node->faces; face; face = next) { for (face = node->faces; face; face = next) {
next = face->next; next = face->next;
memset(face, 0, sizeof(face_t)); memset(face, 0, sizeof(face_t));
FreeMem(face, FACE, 1); free(face);
} }
FreeMem(node, NODE, 1); free(node);
return nodenum; return nodenum;
} }