qbsp: rename Error_() to Error()
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
--- a/qbsp/brush.c
+++ b/qbsp/brush.c
@@ -60,7 +60,7 @@
vec3_t dir, edgenormal, facenormal;
if (f->w.numpoints < 3)
- Error_("%s: too few points (%i)", __func__, f->w.numpoints);
+ Error("%s: too few points (%i)", __func__, f->w.numpoints);
VectorCopy(map.planes[f->planenum].normal, facenormal);
if (f->planeside) {
@@ -72,7 +72,7 @@
for (j = 0; j < 3; j++)
if (p1[j] > BOGUS_RANGE || p1[j] < -BOGUS_RANGE)
- Error_("%s: coordinate out of range (%f)", __func__, p1[j]);
+ Error("%s: coordinate out of range (%f)", __func__, p1[j]);
j = i + 1 == f->w.numpoints ? 0 : i + 1;
@@ -107,7 +107,7 @@
continue;
d = DotProduct(f->w.points[j], edgenormal);
if (d > edgedist)
- Error_("%s: Found a non-convex face", __func__);
+ Error("%s: Found a non-convex face", __func__);
}
}
}
@@ -244,9 +244,9 @@
len = VectorLength(normal);
if (len < 1 - ON_EPSILON || len > 1 + ON_EPSILON)
- Error_("%s: invalid normal (vector length %.4f)", __func__, len);
+ Error("%s: invalid normal (vector length %.4f)", __func__, len);
if (map.numplanes == map.maxplanes)
- Error_("Internal error: didn't allocate enough planes? (%s)", __func__);
+ Error("Internal error: didn't allocate enough planes? (%s)", __func__);
plane = &map.planes[map.numplanes];
VectorCopy(normal, plane->normal);
@@ -403,7 +403,7 @@
f = AllocMem(FACE, 1, true);
f->w.numpoints = w->numpoints;
if (f->w.numpoints > MAXEDGES)
- Error_("Internal error: face->numpoints > MAXEDGES (%s)", __func__);
+ Error("Internal error: face->numpoints > MAXEDGES (%s)", __func__);
for (j = 0; j < w->numpoints; j++) {
for (k = 0; k < 3; k++) {
@@ -517,7 +517,7 @@
len = VectorLength(plane->normal);
if (len < 1.0 - NORMAL_EPSILON || len > 1.0 + NORMAL_EPSILON)
- Error_("%s: invalid normal (vector length %.4f)", __func__, len);
+ Error("%s: invalid normal (vector length %.4f)", __func__, len);
mapface = hullbrush->faces;
for (i = 0; i < hullbrush->numfaces; i++, mapface++) {
@@ -526,7 +526,7 @@
return;
}
if (hullbrush->numfaces == MAX_FACES)
- Error_("Internal error: brush->faces >= MAX_FACES (%s)", __func__);
+ Error("Internal error: brush->faces >= MAX_FACES (%s)", __func__);
mapface->plane = *plane;
mapface->texinfo = 0;
@@ -610,7 +610,7 @@
return i;
if (hullbrush->numpoints == MAX_HULL_POINTS)
- Error_("Internal error: hullbrush->numpoints == MAX_HULL_POINTS");
+ Error("Internal error: hullbrush->numpoints == MAX_HULL_POINTS");
VectorCopy(p, hullbrush->points[hullbrush->numpoints]);
@@ -657,7 +657,7 @@
return;
if (hullbrush->numedges == MAX_HULL_EDGES)
- Error_("Internal error: hulbrush->numedges == MAX_HULL_EDGES");
+ Error("Internal error: hulbrush->numedges == MAX_HULL_EDGES");
hullbrush->edges[i][0] = pt1;
hullbrush->edges[i][1] = pt2;
@@ -801,7 +801,7 @@
// create the faces
if (mapbrush->numfaces > MAX_FACES)
- Error_("Internal error: brush->faces >= MAX_FACES (%s)", __func__);
+ Error("Internal error: brush->faces >= MAX_FACES (%s)", __func__);
hullbrush.numfaces = mapbrush->numfaces;
memcpy(hullbrush.faces, mapbrush->faces,
--- a/qbsp/bspfile.c
+++ b/qbsp/bspfile.c
@@ -44,8 +44,8 @@
cFileSize = LoadFile(options.szBSPName, &header, true);
if (header->version != BSPVERSION)
- Error_("%s is version %i, not %i",
- options.szBSPName, header->version, BSPVERSION);
+ Error("%s is version %i, not %i",
+ options.szBSPName, header->version, BSPVERSION);
/* Throw all of the data into the first entity to be written out later */
entity = map.entities;
@@ -53,8 +53,8 @@
map.cTotal[i] = cLumpSize = header->lumps[i].filelen;
iLumpOff = header->lumps[i].fileofs;
if (cLumpSize % rgcMemSize[i])
- Error_("Deformed lump in BSP file (%d size is not divisible by %d)",
- rgcMemSize[i], cLumpSize);
+ Error("Deformed lump in BSP file (%d size is not divisible by %d)",
+ rgcMemSize[i], cLumpSize);
entity->lumps[i].count = cLumpSize / rgcMemSize[i];
entity->lumps[i].data = AllocMem(i, entity->lumps[i].count, false);
@@ -86,7 +86,7 @@
if (entities->data) {
ret = fwrite(entities->data, rgcMemSize[Type], entities->count, f);
if (ret != entities->count)
- Error_("Failure writing to file");
+ Error("Failure writing to file");
cLen += entities->count * rgcMemSize[Type];
}
}
@@ -95,7 +95,7 @@
if (Type == BSPENT) {
ret = fwrite("", 1, 1, f);
if (ret != 1)
- Error_("Failure writing to file");
+ Error("Failure writing to file");
cLen++;
}
lump->filelen = cLen;
@@ -105,7 +105,7 @@
size_t pad = 4 - (cLen % 4);
ret = fwrite(" ", 1, pad, f);
if (ret != pad)
- Error_("Failure writing to file");
+ Error("Failure writing to file");
}
}
@@ -128,12 +128,12 @@
f = fopen(options.szBSPName, "wb");
if (!f)
- Error_("Failed to open %s: %s", options.szBSPName, strerror(errno));
+ Error("Failed to open %s: %s", options.szBSPName, strerror(errno));
/* write placeholder, header is overwritten later */
ret = fwrite(header, sizeof(dheader_t), 1, f);
if (ret != 1)
- Error_("Failure writing to file");
+ Error("Failure writing to file");
AddLump(f, BSPPLANE);
AddLump(f, BSPLEAF);
@@ -155,7 +155,7 @@
fseek(f, 0, SEEK_SET);
ret = fwrite(header, sizeof(dheader_t), 1, f);
if (ret != 1)
- Error_("Failure writing to file");
+ Error("Failure writing to file");
fclose(f);
FreeMem(header, OTHER, sizeof(dheader_t));
--- a/qbsp/csg4.c
+++ b/qbsp/csg4.c
@@ -101,7 +101,7 @@
vec3_t mid;
if (in->w.numpoints < 0)
- Error_("Attempting to split freed face");
+ Error("Attempting to split freed face");
/* Fast test */
dot = DotProduct(in->origin, split->normal) - split->dist;
@@ -176,7 +176,7 @@
}
if (newf->w.numpoints > MAXEDGES || new2->w.numpoints > MAXEDGES)
- 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 */
FreeMem(in, FACE, 1);
--- a/qbsp/file.c
+++ b/qbsp/file.c
@@ -40,7 +40,7 @@
f = fopen(filename, "rb");
if (!f) {
if (nofail)
- Error_("Failed to open %s: %s", filename, strerror(errno));
+ Error("Failed to open %s: %s", filename, strerror(errno));
return 0;
}
@@ -52,7 +52,7 @@
((char *)*buf)[len] = 0;
if (fread(*buf, 1, len, f) != len)
- Error_("Failure reading from file");
+ Error("Failure reading from file");
fclose(f);
--- a/qbsp/map.c
+++ b/qbsp/map.c
@@ -41,7 +41,7 @@
return i;
}
if (map.nummiptex == map.maxmiptex)
- Error_("Internal error: map.nummiptex > map.maxmiptex");
+ Error("Internal error: map.nummiptex > map.maxmiptex");
strcpy(map.miptex[i], name);
map.nummiptex++;
@@ -178,7 +178,7 @@
return;
parse_error:
- Error_("line %d: Entity key or value too long", parser->linenum);
+ Error("line %d: Entity key or value too long", parser->linenum);
}
@@ -309,7 +309,7 @@
VectorSubtract(planepts[2], planepts[0], vecs[1]);
break;
default:
- Error_("Internal error: bad texture coordinate style");
+ Error("Internal error: bad texture coordinate style");
}
VectorScale(vecs[0], 1.0 / 128.0, vecs[0]);
VectorScale(vecs[1], 1.0 / 128.0, vecs[1]);
@@ -386,7 +386,7 @@
return;
parse_error:
- Error_("line %d: Invalid brush plane format", parser->linenum);
+ Error("line %d: Invalid brush plane format", parser->linenum);
}
static void
@@ -418,7 +418,7 @@
return;
parse_error:
- Error_("line %d: couldn't parse Valve220 texture info", parser->linenum);
+ Error("line %d: couldn't parse Valve220 texture info", parser->linenum);
}
static void
@@ -511,7 +511,7 @@
break;
if (map.numfaces == map.maxfaces)
- Error_("Internal error: didn't allocate enough faces?");
+ Error("Internal error: didn't allocate enough faces?");
faceok = ParseBrushFace(parser, face);
if (!faceok)
@@ -550,20 +550,20 @@
return false;
if (strcmp(parser->token, "{"))
- Error_("line %d: Invalid entity format, { not found", parser->linenum);
+ Error("line %d: Invalid entity format, { not found", parser->linenum);
if (map.numentities == map.maxentities)
- Error_("Internal error: didn't allocate enough entities?");
+ Error("Internal error: didn't allocate enough entities?");
entity->mapbrushes = brush = map.brushes + map.numbrushes;
do {
if (!ParseToken(parser, PARSE_NORMAL))
- Error_("Unexpected EOF (no closing brace)");
+ Error("Unexpected EOF (no closing brace)");
if (!strcmp(parser->token, "}"))
break;
else if (!strcmp(parser->token, "{")) {
if (map.numbrushes == map.maxbrushes)
- Error_("Internal error: didn't allocate enough brushes?");
+ Error("Internal error: didn't allocate enough brushes?");
ParseBrush(parser, brush++);
map.numbrushes++;
} else
@@ -685,7 +685,7 @@
/* Double check the entity count matches our pre-parse count */
if (map.numentities != map.maxentities)
- Error_("Internal error: mismatched entity count?");
+ Error("Internal error: mismatched entity count?");
FreeMem(buf, OTHER, length + 1);
@@ -699,7 +699,7 @@
// Clean up texture memory
if (map.nummiptex > map.maxfaces)
- Error_("Internal error: map.nummiptex > map.maxfaces");
+ Error("Internal error: map.nummiptex > map.maxfaces");
else if (map.nummiptex < map.maxfaces) {
// For stuff in AddAnimatingTex, make room available
pTemp = map.miptex;
@@ -711,7 +711,7 @@
texinfo = &pWorldEnt->lumps[BSPTEXINFO];
if (texinfo->index > texinfo->count)
- Error_("Internal error: didn't allocate enough texinfos?");
+ Error("Internal error: didn't allocate enough texinfos?");
else if (texinfo->index < texinfo->count) {
pTemp = texinfo->data;
texinfo->data = AllocMem(BSPTEXINFO, texinfo->index, true);
--- a/qbsp/merge.c
+++ b/qbsp/merge.c
@@ -41,7 +41,7 @@
VectorNormalize(v2);
if (VectorCompare(v1, v2))
- Error_("Colinear edge (%s)", __func__);
+ Error("Colinear edge (%s)", __func__);
}
}
#endif /* PARANOID */
--- a/qbsp/outside.c
+++ b/qbsp/outside.c
@@ -80,7 +80,7 @@
strcat(options.szBSPName, ".por");
porfile = fopen(options.szBSPName, "wt");
if (!porfile)
- Error_("Failed to open %s: %s", options.szBSPName, strerror(errno));
+ Error("Failed to open %s: %s", options.szBSPName, strerror(errno));
fprintf(porfile, "PLACEHOLDER\r\n");
@@ -96,7 +96,7 @@
strcat(options.szBSPName, ".pts");
ptsfile = fopen(options.szBSPName, "wt");
if (!ptsfile)
- Error_("Failed to open %s: %s", options.szBSPName, strerror(errno));
+ Error("Failed to open %s: %s", options.szBSPName, strerror(errno));
return ptsfile;
}
@@ -108,7 +108,7 @@
int i, side, count;
if (!node)
- Error_("Internal error: no leak node! (%s)", __func__);
+ Error("Internal error: no leak node! (%s)", __func__);
count = 0;
for (portal = node->portals; portal; portal = portal->next[!side]) {
@@ -177,7 +177,7 @@
const portal_t *portal1;
if (leak->numportals >= leak->maxportals)
- Error_("Internal error: numportals > maxportals (%s)", __func__);
+ Error("Internal error: numportals > maxportals (%s)", __func__);
leak->portals[leak->numportals++] = portal2;
--- a/qbsp/parser.c
+++ b/qbsp/parser.c
@@ -47,12 +47,12 @@
while (*p->pos <= 32) {
if (!*p->pos) {
if (flags & PARSE_SAMELINE)
- Error_("line %d: Line is incomplete", p->linenum);
+ Error("line %d: Line is incomplete", p->linenum);
return false;
}
if (*p->pos++ == '\n') {
if (flags & PARSE_SAMELINE)
- Error_("line %d: Line is incomplete", p->linenum);
+ Error("line %d: Line is incomplete", p->linenum);
p->linenum++;
}
}
@@ -64,16 +64,16 @@
while (*p->pos && *p->pos != '\n') {
*token_p++ = *p->pos++;
if (token_p > &p->token[MAXTOKEN - 1])
- Error_("line %d: Token too large", p->linenum);
+ Error("line %d: Token too large", p->linenum);
}
goto out;
}
if (flags & PARSE_SAMELINE)
- Error_("line %d: Line is incomplete", p->linenum);
+ Error("line %d: Line is incomplete", p->linenum);
while (*p->pos++ != '\n')
if (!*p->pos) {
if (flags & PARSE_SAMELINE)
- Error_("line %d: Line is incomplete", p->linenum);
+ Error("line %d: Line is incomplete", p->linenum);
return false;
}
goto skipspace;
@@ -88,17 +88,17 @@
p->pos++;
while (*p->pos != '"') {
if (!*p->pos)
- Error_("line %d: EOF inside quoted token", p->linenum);
+ Error("line %d: EOF inside quoted token", p->linenum);
*token_p++ = *p->pos++;
if (token_p > &p->token[MAXTOKEN - 1])
- Error_("line %d: Token too large", p->linenum);
+ Error("line %d: Token too large", p->linenum);
}
p->pos++;
} else
while (*p->pos > 32) {
*token_p++ = *p->pos++;
if (token_p > &p->token[MAXTOKEN - 1])
- Error_("line %d: Token too large", p->linenum);
+ Error("line %d: Token too large", p->linenum);
}
out:
*token_p = 0;
--- a/qbsp/portals.c
+++ b/qbsp/portals.c
@@ -189,7 +189,7 @@
/* Sanity check */
if (node->viscluster != viscluster)
- Error_("Internal error: Detail cluster mismatch (%s)", __func__);
+ Error("Internal error: Detail cluster mismatch (%s)", __func__);
fprintf(PortalFile, "%d ", node->visleafnum);
@@ -279,7 +279,7 @@
PortalFile = fopen(options.szBSPName, "wt");
if (!PortalFile)
- Error_("Failed to open %s: %s", options.szBSPName, strerror(errno));
+ Error("Failed to open %s: %s", options.szBSPName, strerror(errno));
/* If no detail clusters, just use a normal PRT1 format */
if (num_visclusters == num_visleafs) {
@@ -295,7 +295,7 @@
WritePortals_r(headnode, true);
check = WriteClusters_r(headnode, 0);
if (check != num_visclusters - 1)
- Error_("Internal error: Detail cluster mismatch (%s)", __func__);
+ Error("Internal error: Detail cluster mismatch (%s)", __func__);
fprintf(PortalFile, "-1\n");
}
@@ -314,7 +314,7 @@
AddPortalToNodes(portal_t *p, node_t *front, node_t *back)
{
if (p->nodes[0] || p->nodes[1])
- Error_("portal already included (%s)", __func__);
+ Error("portal already included (%s)", __func__);
p->nodes[0] = front;
p->next[0] = front->portals;
@@ -341,7 +341,7 @@
while (1) {
t = *pp;
if (!t)
- Error_("Portal not in leaf (%s)", __func__);
+ Error("Portal not in leaf (%s)", __func__);
if (t == portal)
break;
@@ -351,7 +351,7 @@
else if (t->nodes[1] == l)
pp = &t->next[1];
else
- Error_("Portal not bounding leaf (%s)", __func__);
+ Error("Portal not bounding leaf (%s)", __func__);
}
if (portal->nodes[0] == l) {
@@ -495,7 +495,7 @@
else if (p->nodes[1] == node)
side = 1;
else
- Error_("Mislinked portal (%s)", __func__);
+ Error("Mislinked portal (%s)", __func__);
CheckWindingInNode(p->winding, node);
CheckWindingArea(p->winding);
@@ -510,7 +510,7 @@
else if (p2->nodes[1] == node)
side2 = 1;
else
- Error_("Mislinked portal (%s)", __func__);
+ Error("Mislinked portal (%s)", __func__);
w = p2->winding;
for (i = 0; i < w->numpoints; i++) {
@@ -576,7 +576,7 @@
VectorSubtract(vec3_origin, clipplane.normal, clipplane.normal);
side = 1;
} else
- Error_("Mislinked portal (%s)", __func__);
+ Error("Mislinked portal (%s)", __func__);
winding = ClipWinding(winding, &clipplane, true);
if (!winding) {
@@ -598,7 +598,7 @@
else if (portal->nodes[1] == node)
side = 1;
else
- Error_("Mislinked portal (%s)", __func__);
+ Error("Mislinked portal (%s)", __func__);
next_portal = portal->next[side];
other_node = portal->nodes[!side];
--- a/qbsp/qbsp.c
+++ b/qbsp/qbsp.c
@@ -88,7 +88,7 @@
Brush_LoadEntity(entity, entity, hullnum);
if (!entity->brushes && hullnum) {
PrintEntity(entity);
- Error_("Entity with no valid brushes");
+ Error("Entity with no valid brushes");
}
/*
@@ -442,7 +442,7 @@
else if (NameCount == 1)
strcpy(options.szBSPName, szTok);
else
- Error_("Unknown option '%s'", szTok);
+ Error("Unknown option '%s'", szTok);
NameCount++;
} else {
szTok++;
@@ -475,19 +475,19 @@
else if (!strcasecmp(szTok, "leakdist")) {
szTok2 = GetTok(szTok + strlen(szTok) + 1, szEnd);
if (!szTok2)
- Error_("Invalid argument to option %s", szTok);
+ Error("Invalid argument to option %s", szTok);
options.dxLeakDist = atoi(szTok2);
szTok = szTok2;
} else if (!strcasecmp(szTok, "subdivide")) {
szTok2 = GetTok(szTok + strlen(szTok) + 1, szEnd);
if (!szTok2)
- Error_("Invalid argument to option %s", szTok);
+ Error("Invalid argument to option %s", szTok);
options.dxSubdivide = atoi(szTok2);
szTok = szTok2;
} else if (!strcasecmp(szTok, "wadpath")) {
szTok2 = GetTok(szTok + strlen(szTok) + 1, szEnd);
if (!szTok2)
- Error_("Invalid argument to option %s", szTok);
+ Error("Invalid argument to option %s", szTok);
strcpy(options.wadPath, szTok2);
szTok = szTok2;
/* Remove trailing /, if any */
@@ -496,7 +496,7 @@
} else if (!strcasecmp(szTok, "?") || !strcasecmp(szTok, "help"))
PrintOptions();
else
- Error_("Unknown option '%s'", szTok);
+ Error("Unknown option '%s'", szTok);
}
szTok = GetTok(szTok + strlen(szTok) + 1, szEnd);
}
--- a/qbsp/qbsp.h
+++ b/qbsp/qbsp.h
@@ -683,7 +683,7 @@
extern void PrintMem(void);
extern void Message(int MsgType, ...);
-extern void Error_(const char *error, ...)
+extern void Error(const char *error, ...)
__attribute__((format(printf,1,2),noreturn));
extern FILE *logfile;
--- a/qbsp/solidbsp.c
+++ b/qbsp/solidbsp.c
@@ -276,7 +276,7 @@
}
}
if (!bestsurface)
- Error_("No valid planes in surface list (%s)", __func__);
+ Error("No valid planes in surface list (%s)", __func__);
return bestsurface;
}
@@ -460,7 +460,7 @@
for (f = surf->faces; f; f = f->next) {
if (f->contents[0] >= 0 || f->contents[1] >= 0)
- Error_("Bad contents in face (%s)", __func__);
+ Error("Bad contents in face (%s)", __func__);
for (i = 0; i < f->w.numpoints; i++)
for (j = 0; j < 3; j++) {
if (f->w.points[i][j] < surf->mins[j])
@@ -618,8 +618,8 @@
if (!leafnode->contents)
leafnode->contents = f->contents[0];
else if (leafnode->contents != f->contents[0])
- Error_("Mixed face contents in leafnode near (%.2f %.2f %.2f)",
- f->w.points[0][0], f->w.points[0][1], f->w.points[0][2]);
+ Error("Mixed face contents in leafnode near (%.2f %.2f %.2f)",
+ f->w.points[0][0], f->w.points[0][1], f->w.points[0][2]);
}
}
@@ -640,7 +640,7 @@
c_water++;
break;
default:
- Error_("Bad contents in face (%s)", __func__);
+ Error("Bad contents in face (%s)", __func__);
}
// write the list of faces, and free the originals
@@ -747,13 +747,13 @@
if (frontfrag) {
if (!frontfrag->faces)
- Error_("Surface with no faces (%s)", __func__);
+ Error("Surface with no faces (%s)", __func__);
frontfrag->next = frontlist;
frontlist = frontfrag;
}
if (backfrag) {
if (!backfrag->faces)
- Error_("Surface with no faces (%s)", __func__);
+ Error("Surface with no faces (%s)", __func__);
backfrag->next = backlist;
backlist = backfrag;
}
--- a/qbsp/surfaces.c
+++ b/qbsp/surfaces.c
@@ -76,7 +76,7 @@
next = f->next;
SplitFace(f, &plane, &front, &back);
if (!front || !back)
- Error_("Didn't split the polygon (%s)", __func__);
+ Error("Didn't split the polygon (%s)", __func__);
*prevptr = back;
back->next = front;
front->next = next;
@@ -243,7 +243,7 @@
map.cTotal[BSPVERTEX]++;
if (vertices->index > vertices->count)
- Error_("Internal error: didn't allocate enough vertices?");
+ Error("Internal error: didn't allocate enough vertices?");
return hv->num;
}
@@ -268,7 +268,7 @@
struct lumpdata *edges = &entity->lumps[BSPEDGE];
if (!f->contents[0])
- Error_("Face with 0 contents (%s)", __func__);
+ Error("Face with 0 contents (%s)", __func__);
c_tryedges++;
v1 = GetVertex(entity, p1);
@@ -286,7 +286,7 @@
/* emit an edge */
if (edges->index >= edges->count)
- Error_("Internal error: didn't allocate enough edges?");
+ Error("Internal error: didn't allocate enough edges?");
edge = (dedge_t *)edges->data + edges->index;
edges->index++;
@@ -310,7 +310,7 @@
face->outputnumber = -1;
if (face->w.numpoints > MAXEDGES)
- Error_("Internal error: face->numpoints > MAXEDGES (%s)", __func__);
+ Error("Internal error: face->numpoints > MAXEDGES (%s)", __func__);
face->edges = AllocMem(OTHER, face->w.numpoints * sizeof(int), true);
for (i = 0; i < face->w.numpoints; i++)
--- a/qbsp/tjunc.c
+++ b/qbsp/tjunc.c
@@ -106,7 +106,7 @@
} else
vec[2] = 0;
- Error_("Degenerate edge at (%.3f %.3f %.3f)", vec[0], vec[1], vec[2]);
+ Error("Degenerate edge at (%.3f %.3f %.3f)", vec[0], vec[1], vec[2]);
}
static wedge_t *
@@ -159,7 +159,7 @@
}
if (numwedges >= cWEdges)
- Error_("Internal error: didn't allocate enough edges for tjuncs?");
+ Error("Internal error: didn't allocate enough edges for tjuncs?");
w = pWEdges + numwedges;
numwedges++;
@@ -196,7 +196,7 @@
// insert a new wvert before v
if (numwverts >= cWVerts)
- Error_("Internal error: didn't allocate enough vertices for tjuncs?");
+ Error("Internal error: didn't allocate enough vertices for tjuncs?");
newv = pWVerts + numwverts;
numwverts++;
@@ -314,7 +314,7 @@
newf = NewFaceFromFace(f);
if (f->original)
- Error_("original face still exists (%s)", __func__);
+ Error("original face still exists (%s)", __func__);
newf->original = chain;
chain = newf;
--- a/qbsp/util.c
+++ b/qbsp/util.c
@@ -43,12 +43,12 @@
int cSize;
if (Type < 0 || Type > OTHER)
- Error_("Internal error: invalid memory type %d (%s)", Type, __func__);
+ Error("Internal error: invalid memory type %d (%s)", Type, __func__);
// For windings, cElements == number of points on winding
if (Type == WINDING) {
if (cElements > MAX_POINTS_ON_WINDING)
- Error_("Too many points (%d) on winding (%s)", cElements, __func__);
+ Error("Too many points (%d) on winding (%s)", cElements, __func__);
cSize = offsetof(winding_t, points[cElements]) + sizeof(int);
@@ -59,7 +59,7 @@
pTemp = malloc(cSize);
if (!pTemp)
- Error_("allocation of %d bytes failed (%s)", cSize, __func__);
+ Error("allocation of %d bytes failed (%s)", cSize, __func__);
if (fZero)
memset(pTemp, 0, cSize);
@@ -202,7 +202,7 @@
static bool fInPercent = false;
void
-Error_(const char *error, ...)
+Error(const char *error, ...)
{
va_list argptr;
char message[512];
--- a/qbsp/wad.c
+++ b/qbsp/wad.c
@@ -211,7 +211,7 @@
if (!size)
continue;
if (data + size - (byte *)texdata->data > texdata->count)
- Error_("Internal error: not enough texture memory allocated");
+ Error("Internal error: not enough texture memory allocated");
lump->dataofs[i] = data - (byte *)lump;
data += size;
}
@@ -229,7 +229,7 @@
fseek(wad->file, wad->lumps[i].filepos, SEEK_SET);
size = fread(dest, 1, wad->lumps[i].disksize, wad->file);
if (size != wad->lumps[i].disksize)
- Error_("Failure reading from file");
+ Error("Failure reading from file");
return wad->lumps[i].disksize;
}
}
--- a/qbsp/winding.c
+++ b/qbsp/winding.c
@@ -58,7 +58,7 @@
vup[0] = 1;
break;
default:
- Error_("Internal error: no axis for winding (%s)", __func__);
+ Error("Internal error: no axis for winding (%s)", __func__);
}
v = DotProduct(vup, p->normal);
@@ -227,7 +227,7 @@
}
if (neww->numpoints > maxpts)
- Error_("Internal error: excess clipped points (%s)", __func__);
+ Error("Internal error: excess clipped points (%s)", __func__);
// free the original winding
FreeMem(in, WINDING, 1);
@@ -324,7 +324,7 @@
}
if (f->numpoints > maxpts || b->numpoints > maxpts)
- Error_("Internal error: excess clipped points (%s)", __func__);
+ Error("Internal error: excess clipped points (%s)", __func__);
}
--- a/qbsp/writebsp.c
+++ b/qbsp/writebsp.c
@@ -54,7 +54,7 @@
if (i == planes->index) {
if (planes->index >= planes->count)
- Error_("Internal error: plane count mismatch (%s)", __func__);
+ Error("Internal error: plane count mismatch (%s)", __func__);
plane = &map.planes[node->planenum];
dplane = (dplane_t *)planes->data + planes->index;
dplane->normal[0] = plane->normal[0];
@@ -188,8 +188,8 @@
CountClipNodes_r(entity, nodes);
if (clipnodes->count > MAX_BSP_CLIPNODES)
- Error_("Clipnode count exceeds bsp29 max (%d > %d)",
- clipnodes->count, MAX_BSP_CLIPNODES);
+ Error("Clipnode count exceeds bsp29 max (%d > %d)",
+ clipnodes->count, MAX_BSP_CLIPNODES);
olddata = clipnodes->data;
clipnodes->data = AllocMem(BSPCLIPNODE, clipnodes->count, true);