From: divverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Thu, 12 Feb 2009 06:37:47 +0000 (+0000)
Subject: entirely remove MAX_ORIGINAL_EDGES and MAX_EDGE_LINES
X-Git-Tag: svn-r421~233
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=257c44e5310407b9f6c1c2523f4529d23b558ac4;p=xonotic%2Fnetradiant.git

entirely remove MAX_ORIGINAL_EDGES and MAX_EDGE_LINES


git-svn-id: svn://svn.icculus.org/netradiant/trunk@187 61c419a2-8eb2-4b30-bcec-8cead039b335
---

diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.c
index 0c322c72..416d56c3 100644
--- a/tools/quake3/q3map2/tjunction.c
+++ b/tools/quake3/q3map2/tjunction.c
@@ -63,14 +63,14 @@ typedef struct {
 	bspDrawVert_t	*dv[2];
 } originalEdge_t;
 
-#define	MAX_ORIGINAL_EDGES	0x100000
-originalEdge_t	originalEdges[MAX_ORIGINAL_EDGES];
+originalEdge_t	*originalEdges = NULL;
 int				numOriginalEdges;
+int				allocatedOriginalEdges = 0;
 
 
-#define	MAX_EDGE_LINES		0x100000
-edgeLine_t		edgeLines[MAX_EDGE_LINES];
+edgeLine_t		*edgeLines = NULL;
 int				numEdgeLines;
+int				allocatedEdgeLines = 0;
 
 int				c_degenerateEdges;
 int				c_addedVerts;
@@ -153,9 +153,7 @@ int AddEdge( vec3_t v1, vec3_t v2, qboolean createNonAxial ) {
 
 	if ( !createNonAxial ) {
 		if ( fabs( dir[0] + dir[1] + dir[2] ) != 1.0 ) {
-			if ( numOriginalEdges == MAX_ORIGINAL_EDGES ) {
-				Error( "MAX_ORIGINAL_EDGES" );
-			}
+			AUTOEXPAND_BY_REALLOC(originalEdges, numOriginalEdges, allocatedOriginalEdges, 1024);
 			originalEdges[ numOriginalEdges ].dv[0] = (bspDrawVert_t *)v1;
 			originalEdges[ numOriginalEdges ].dv[1] = (bspDrawVert_t *)v2;
 			originalEdges[ numOriginalEdges ].length = d;
@@ -192,9 +190,7 @@ int AddEdge( vec3_t v1, vec3_t v2, qboolean createNonAxial ) {
 	}
 
 	// create a new edge
-	if ( numEdgeLines >= MAX_EDGE_LINES ) {
-		Error( "MAX_EDGE_LINES" );
-	}
+	AUTOEXPAND_BY_REALLOC(edgeLines, numEdgeLines, allocatedEdgeLines, 1024);
 
 	e = &edgeLines[ numEdgeLines ];
 	numEdgeLines++;