From b9fa895988f821ebc638dd4c41d7a05d7c0c7a25 Mon Sep 17 00:00:00 2001
From: Kevin Shanahan <kmshanah@disenchant.net>
Date: Mon, 22 Apr 2013 18:47:36 +0930
Subject: [PATCH] qbsp: replace enum errors in portals.c

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
---
 qbsp/globals.c |  5 -----
 qbsp/portals.c | 20 +++++++++++---------
 qbsp/warnerr.h |  5 -----
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/qbsp/globals.c b/qbsp/globals.c
index 694b95d8..48fa0ada 100644
--- a/qbsp/globals.c
+++ b/qbsp/globals.c
@@ -89,10 +89,6 @@ const char *rgszErrors[cErrors] = {
     "Degenerate edge at (%.3f %.3f %.3f)",
     "Found a non-canonical vector",
     "Normalization error in FindPlane (vector length %.4f)",
-    "Portal already included in AddPortalToNodes",
-    "Portal not in leaf",
-    "Portal not bounding leaf",
-    "Mislinked portal in CutNodePortals_r",
     "Didn't split the polygon in SubdivideFace",
     "Internal error: entity->iVertices > entity->cVertices",
     "0 contents in GetEdge",
@@ -105,5 +101,4 @@ const char *rgszErrors[cErrors] = {
     "Too many points on winding (%d)",
     "Out of memory",
     "Clipnodes in map exceed " stringify(MAX_BSP_CLIPNODES),
-    "Internal error: Detail cluster mismatch",
 };
diff --git a/qbsp/portals.c b/qbsp/portals.c
index 45568d19..efc278b1 100644
--- a/qbsp/portals.c
+++ b/qbsp/portals.c
@@ -189,7 +189,7 @@ WriteClusters_r(node_t *node, int viscluster)
 
     /* Sanity check */
     if (node->viscluster != viscluster)
-	Error(errDetailClusterMismatch);
+	Error_("Internal error: Detail cluster mismatch (%s)", __func__);
 
     fprintf(PortalFile, "%d ", node->visleafnum);
 
@@ -295,7 +295,7 @@ WritePortalfile(node_t *headnode)
 	WritePortals_r(headnode, true);
 	check = WriteClusters_r(headnode, 0);
 	if (check != num_visclusters - 1)
-	    Error(errDetailClusterMismatch);
+	    Error_("Internal error: Detail cluster mismatch (%s)", __func__);
 	fprintf(PortalFile, "-1\n");
     }
 
@@ -314,7 +314,7 @@ static void
 AddPortalToNodes(portal_t *p, node_t *front, node_t *back)
 {
     if (p->nodes[0] || p->nodes[1])
-	Error(errPortalAlreadyAdded);
+	Error_("portal already included (%s)", __func__);
 
     p->nodes[0] = front;
     p->next[0] = front->portals;
@@ -341,7 +341,7 @@ RemovePortalFromNode(portal_t *portal, node_t *l)
     while (1) {
 	t = *pp;
 	if (!t)
-	    Error(errPortalNotInLeaf);
+	    Error_("Portal not in leaf (%s)", __func__);
 
 	if (t == portal)
 	    break;
@@ -351,7 +351,7 @@ RemovePortalFromNode(portal_t *portal, node_t *l)
 	else if (t->nodes[1] == l)
 	    pp = &t->next[1];
 	else
-	    Error(errPortalNotBoundLeaf);
+	    Error_("Portal not bounding leaf (%s)", __func__);
     }
 
     if (portal->nodes[0] == l) {
@@ -495,7 +495,8 @@ CheckLeafPortalConsistancy(node_t *node)
 	else if (p->nodes[1] == node)
 	    side = 1;
 	else
-	    Error(errMislinkedPortal);
+	    Error_("Mislinked portal (%s)", __func__);
+
 	CheckWindingInNode(p->winding, node);
 	CheckWindingArea(p->winding);
 
@@ -509,7 +510,8 @@ CheckLeafPortalConsistancy(node_t *node)
 	    else if (p2->nodes[1] == node)
 		side2 = 1;
 	    else
-		Error(errMislinkedPortal);
+		Error_("Mislinked portal (%s)", __func__);
+
 	    w = p2->winding;
 	    for (i = 0; i < w->numpoints; i++) {
 		dist = DotProduct(w->points[i], plane.normal) - plane.dist;
@@ -574,7 +576,7 @@ CutNodePortals_r(node_t *node)
 	    VectorSubtract(vec3_origin, clipplane.normal, clipplane.normal);
 	    side = 1;
 	} else
-	    Error(errMislinkedPortal);
+	    Error_("Mislinked portal (%s)", __func__);
 
 	winding = ClipWinding(winding, &clipplane, true);
 	if (!winding) {
@@ -596,7 +598,7 @@ CutNodePortals_r(node_t *node)
 	else if (portal->nodes[1] == node)
 	    side = 1;
 	else
-	    Error(errMislinkedPortal);
+	    Error_("Mislinked portal (%s)", __func__);
 	next_portal = portal->next[side];
 
 	other_node = portal->nodes[!side];
diff --git a/qbsp/warnerr.h b/qbsp/warnerr.h
index 0349ddee..ac4ce7ec 100644
--- a/qbsp/warnerr.h
+++ b/qbsp/warnerr.h
@@ -60,10 +60,6 @@ enum {
     errDegenerateEdge,
     errNonCanonicalVector,
     errNormalization,
-    errPortalAlreadyAdded,
-    errPortalNotInLeaf,
-    errPortalNotBoundLeaf,	// 40
-    errMislinkedPortal,
     errNoPolygonSplit,
     errLowVertexCount,
     errZeroContents,
@@ -76,6 +72,5 @@ enum {
     errTooManyPoints,
     errOutOfMemory,
     errTooManyClipnodes,
-    errDetailClusterMismatch,
     cErrors
 };