From 1123205d476c0aca99690969cac54794e8ff282a Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Tue, 24 Aug 2021 22:49:06 -0600 Subject: [PATCH] qbsp: replace FreeMem uses --- qbsp/brush.cc | 16 ++++++++-------- qbsp/csg4.cc | 6 +++--- qbsp/map.cc | 6 +++--- qbsp/merge.cc | 4 ++-- qbsp/portals.cc | 10 +++++----- qbsp/qbsp.cc | 6 +++--- qbsp/solidbsp.cc | 8 ++++---- qbsp/surfaces.cc | 6 +++--- qbsp/test_qbsp.cc | 4 ++-- qbsp/tjunc.cc | 6 +++--- qbsp/wad.cc | 4 ++-- qbsp/winding.cc | 8 ++++---- qbsp/writebsp.cc | 6 +++--- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/qbsp/brush.cc b/qbsp/brush.cc index a316f706..8ad30083 100644 --- a/qbsp/brush.cc +++ b/qbsp/brush.cc @@ -461,7 +461,7 @@ CreateBrushFaces(const mapentity_t *src, hullbrush_t *hullbrush, VectorSubtract(point, rotate_offset, point); plane.dist = DotProduct(plane.normal, point); - FreeMem(w, WINDING, 1); + free(w); f->texinfo = hullnum ? 0 : mapface->texinfo; f->planenum = FindPlane(plane.normal, plane.dist, &f->planeside); @@ -518,7 +518,7 @@ FreeBrushFaces(face_t *facelist) for (face = facelist; face; face = next) { next = face->next; - FreeMem(face, FACE, 1); + free(face); } } @@ -549,7 +549,7 @@ void FreeBrush(brush_t *brush) { FreeBrushFaces(brush->faces); - FreeMem(brush, BRUSH, 1); + free(brush); } /* @@ -1614,7 +1614,7 @@ void SplitBrush (const brush_t *brush, int side; if (w) - FreeMem(w, WINDING, 1); + free(w); side = BrushMostlyOnSide (brush, plane.normal, plane.dist); if (side == SIDE_FRONT) @@ -1684,9 +1684,9 @@ void SplitBrush (const brush_t *brush, } if (cw[0]) - FreeMem(cw[0], WINDING, 1); + free(cw[0]); 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); newface->planenum = planenum; newface->planeside = !planeside; - FreeMem(newwinding, WINDING, 1); + free(newwinding); } else { CopyWindingInto(&newface->w, midwinding); newface->planenum = planenum; @@ -1777,7 +1777,7 @@ void SplitBrush (const brush_t *brush, *front = b[0]; *back = b[1]; - FreeMem(midwinding, WINDING, 1); + free(midwinding); } #if 0 diff --git a/qbsp/csg4.cc b/qbsp/csg4.cc index 4eabd7e9..f110195a 100644 --- a/qbsp/csg4.cc +++ b/qbsp/csg4.cc @@ -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__); /* 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 { face->next = *inside; *inside = face; - FreeMem(w, WINDING, 1); + free(w); } face = next; } @@ -414,7 +414,7 @@ FreeFaces(face_t *face) while (face) { next = face->next; - FreeMem(face, FACE, 1); + free(face); face = next; } } diff --git a/qbsp/map.cc b/qbsp/map.cc index bec3deff..43d73f72 100644 --- a/qbsp/map.cc +++ b/qbsp/map.cc @@ -1928,7 +1928,7 @@ mapentity_t LoadExternalMap(const char *filename) Message(msgStat, "LoadExternalMap: '%s': Loaded %d mapbrushes.\n", filename, dest.nummapbrushes); - FreeMem(buf, OTHER, length + 1); + free(buf); return dest; } @@ -1958,7 +1958,7 @@ LoadMapFile(void) assert(map.entities.back().numbrushes == 0); map.entities.pop_back(); - FreeMem(buf, OTHER, length + 1); + free(buf); // Print out warnings for entities if (!(rgfStartSpots & info_player_start)) @@ -2325,7 +2325,7 @@ WriteBspBrushMap(const char *name, const std::vector &list) fprintf (f, "notexture 0 0 0 1 1\n" ); - FreeMem(w, WINDING, 1); + free(w); } fprintf (f, "}\n"); } diff --git a/qbsp/merge.cc b/qbsp/merge.cc index 755748a5..7108e872 100644 --- a/qbsp/merge.cc +++ b/qbsp/merge.cc @@ -187,7 +187,7 @@ MergeFaceToList(face_t *face, face_t *list) #endif newf = TryMerge(face, f); if (newf) { - FreeMem(face, FACE, 1); + free(face); f->w.numpoints = -1; // merged out, remove later face = newf; f = list; @@ -215,7 +215,7 @@ FreeMergeListScraps(face_t *merged) for (; merged; merged = next) { next = merged->next; if (merged->w.numpoints == -1) - FreeMem(merged, FACE, 1); + free(merged); else { merged->next = head; head = merged; diff --git a/qbsp/portals.cc b/qbsp/portals.cc index fdac7c6d..a565b9a1 100644 --- a/qbsp/portals.cc +++ b/qbsp/portals.cc @@ -630,7 +630,7 @@ CutNodePortals_r(node_t *node, portal_state_t *state) if (!frontwinding) { if (backwinding) - FreeMem(backwinding, WINDING, 1); + free(backwinding); if (side == 0) AddPortalToNodes(portal, back, other_node); @@ -640,7 +640,7 @@ CutNodePortals_r(node_t *node, portal_state_t *state) } if (!backwinding) { if (frontwinding) - FreeMem(frontwinding, WINDING, 1); + free(frontwinding); if (side == 0) 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; new_portal->winding = backwinding; - FreeMem(portal->winding, WINDING, 1); + free(portal->winding); portal->winding = frontwinding; if (side == 0) { @@ -728,8 +728,8 @@ FreeAllPortals(node_t *node) nextp = p->next[1]; RemovePortalFromNode(p, p->nodes[0]); RemovePortalFromNode(p, p->nodes[1]); - FreeMem(p->winding, WINDING, 1); - FreeMem(p, PORTAL, 1); + free(p->winding); + free(p); } node->portals = NULL; } diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc index a335182e..f0f70bee 100644 --- a/qbsp/qbsp.cc +++ b/qbsp/qbsp.cc @@ -621,7 +621,7 @@ EnsureTexturesLoaded() wadlist = WADList_Init(defaultwad); if (wadlist) 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"); ParseOptions(szBuf); - FreeMem(szBuf, OTHER, length + 1); + free(szBuf); } // Concatenate command line args @@ -998,7 +998,7 @@ InitQBSP(int argc, const char **argv) } szBuf[length - 1] = 0; ParseOptions(szBuf); - FreeMem(szBuf, OTHER, length); + free(szBuf); if (options.szMapName[0] == 0) PrintOptions(); diff --git a/qbsp/solidbsp.cc b/qbsp/solidbsp.cc index c571f225..40b252e5 100644 --- a/qbsp/solidbsp.cc +++ b/qbsp/solidbsp.cc @@ -633,12 +633,12 @@ DividePlane(surface_t *in, const qbsp_plane_t *split, surface_t **front, if (in->faces) *front = in; else - FreeMem(in, SURFACE, 1); + free(in); if (newsurf->faces) *back = newsurf; else - FreeMem(newsurf, SURFACE, 1); + free(newsurf); return; } @@ -869,9 +869,9 @@ LinkConvexFaces(surface_t *planelist, node_t *leafnode) next = f->next; leafnode->markfaces[i] = f->original; i++; - FreeMem(f, FACE, 1); + free(f); } - FreeMem(surf, SURFACE, 1); + free(surf); } leafnode->markfaces[i] = NULL; // sentinal } diff --git a/qbsp/surfaces.cc b/qbsp/surfaces.cc index ae41bf42..908221e3 100644 --- a/qbsp/surfaces.cc +++ b/qbsp/surfaces.cc @@ -139,7 +139,7 @@ GatherNodeFaces_r(node_t *node, std::map &planefaces) for (f = node->faces; f; f = next) { next = f->next; if (!f->w.numpoints) { // face was removed outside - FreeMem(f, FACE, 1); + free(f); } else { f->next = planefaces[f->planenum]; planefaces[f->planenum] = f; @@ -148,7 +148,7 @@ GatherNodeFaces_r(node_t *node, std::map &planefaces) GatherNodeFaces_r(node->children[0], 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++) { map.exported_surfedges.push_back(face->edges[i]); } - FreeMem(face->edges, OTHER, face->w.numpoints * sizeof(int)); + free(face->edges); out->numedges = static_cast(map.exported_surfedges.size()) - out->firstedge; } diff --git a/qbsp/test_qbsp.cc b/qbsp/test_qbsp.cc index e1d62c8a..d1898667 100644 --- a/qbsp/test_qbsp.cc +++ b/qbsp/test_qbsp.cc @@ -269,8 +269,8 @@ TEST(qbsp, SplitBrush) { checkCube(back); FreeBrush(brush); - FreeMem(front, BRUSH, 1); - FreeMem(back, BRUSH, 1); + free(front); + free(back); } TEST(qbsp, SplitBrushOnSide) { diff --git a/qbsp/tjunc.cc b/qbsp/tjunc.cc index 0703e7d5..19b66fe3 100644 --- a/qbsp/tjunc.cc +++ b/qbsp/tjunc.cc @@ -509,10 +509,10 @@ TJunc(const mapentity_t *entity, node_t *headnode) tjuncs = tjuncfaces = 0; tjunc_fix_r(headnode, superface); - FreeMem(superface, OTHER, superface_bytes); + free(superface); - FreeMem(pWVerts, WVERT, cWVerts); - FreeMem(pWEdges, WEDGE, cWEdges); + free(pWVerts); + free(pWEdges); Message(msgStat, "%8d edges added by tjunctions", tjuncs); Message(msgStat, "%8d faces added by tjunctions", tjuncfaces); diff --git a/qbsp/wad.cc b/qbsp/wad.cc index 0a587dd9..1e310a32 100644 --- a/qbsp/wad.cc +++ b/qbsp/wad.cc @@ -174,8 +174,8 @@ WADList_Free(wad_t *wadlist) for (wad = wadlist; wad; wad = next) { next = wad->next; fclose(wad->file); - FreeMem(wad->lumps, OTHER, sizeof(lumpinfo_t) * wad->header.numlumps); - FreeMem(wad, OTHER, sizeof(*wad)); + free(wad->lumps); + free(wad); } } diff --git a/qbsp/winding.cc b/qbsp/winding.cc index 6e286c38..35dd1300 100644 --- a/qbsp/winding.cc +++ b/qbsp/winding.cc @@ -204,7 +204,7 @@ ClipWinding(winding_t *in, const qbsp_plane_t *split, bool keepon) return in; if (!counts[SIDE_FRONT]) { - FreeMem(in, WINDING, 1); + free(in); return NULL; } @@ -254,7 +254,7 @@ ClipWinding(winding_t *in, const qbsp_plane_t *split, bool keepon) VectorCopy(mid, neww->points[neww->numpoints]); neww->numpoints++; } - FreeMem(in, WINDING, 1); + free(in); return neww; @@ -459,7 +459,7 @@ void ChopWindingInPlace (winding_t **inout, const vec3_t normal, vec_t dist, vec if (!counts[0]) { - FreeMem (in, WINDING, 1); + free(in); *inout = nullptr; 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) Error ("ClipWinding: MAX_POINTS_ON_WINDING"); - FreeMem (in, WINDING, 1); + free(in); *inout = f; } diff --git a/qbsp/writebsp.cc b/qbsp/writebsp.cc index 27533663..99dc7484 100644 --- a/qbsp/writebsp.cc +++ b/qbsp/writebsp.cc @@ -129,7 +129,7 @@ ExportClipNodes_BSP29(mapentity_t *entity, node_t *node) // FIXME: free more stuff? if (node->planenum == -1) { int contents = node->contents; - FreeMem(node, NODE, 1); + free(node); return contents; } @@ -149,9 +149,9 @@ ExportClipNodes_BSP29(mapentity_t *entity, node_t *node) for (face = node->faces; face; face = next) { next = face->next; memset(face, 0, sizeof(face_t)); - FreeMem(face, FACE, 1); + free(face); } - FreeMem(node, NODE, 1); + free(node); return nodenum; }