trivial patch: remove MAX_MAP_DRAW_VERTS limit completely (the code could already...

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

diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c
index 31b6f171bd4a425d9fe586ada8b2e122ed62ab5b..5b515fc8f815d06f00f7d2931cee29f92b253191 100644 (file)
--- a/tools/quake3/q3map2/bspfile_abstract.c
+++ b/tools/quake3/q3map2/bspfile_abstract.c
@@ -64,7 +64,7 @@ void IncDrawVerts()
 
        if(bspDrawVerts == 0)
        {
-               numBSPDrawVertsBuffer = MAX_MAP_DRAW_VERTS / 37;
+               numBSPDrawVertsBuffer = 1024;
                
                bspDrawVerts = safe_malloc_info(sizeof(bspDrawVert_t) * numBSPDrawVertsBuffer, "IncDrawVerts");
 
@@ -74,9 +74,6 @@ void IncDrawVerts()
                numBSPDrawVertsBuffer *= 3; // multiply by 1.5
                numBSPDrawVertsBuffer /= 2;
 
-               if(numBSPDrawVertsBuffer > MAX_MAP_DRAW_VERTS)
-                       numBSPDrawVertsBuffer = MAX_MAP_DRAW_VERTS;
-
                bspDrawVerts = realloc(bspDrawVerts, sizeof(bspDrawVert_t) * numBSPDrawVertsBuffer);
 
                if(!bspDrawVerts)

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index f26caf264b664de09d9b799e177eab768f5b2e76..045b7586eeca5af6c61d98a1e7ea69ce95c06245 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -322,7 +322,6 @@ abstracted bsp file
 #define        MAX_MAP_VISIBILITY              0x200000
 
 #define        MAX_MAP_DRAW_SURFS              0x20000
-#define        MAX_MAP_DRAW_VERTS              0x80000
 #define        MAX_MAP_DRAW_INDEXES    0x80000
 
 #define MAX_MAP_ADVERTISEMENTS 30

diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c
index 30b4be57223ed1644d818eff97c304e475a64eef..82968420ce57cd5e2e28b854bfde5ba2af281c90 100644 (file)
--- a/tools/quake3/q3map2/surface.c
+++ b/tools/quake3/q3map2/surface.c
@@ -2250,8 +2250,6 @@ void EmitDrawVerts( mapDrawSurface_t *ds, bspDrawSurface_t *out )
        for( i = 0; i < ds->numVerts; i++ )
        {
                /* allocate a new vert */
-               if( numBSPDrawVerts == MAX_MAP_DRAW_VERTS )
-                       Error( "MAX_MAP_DRAW_VERTS" );
                IncDrawVerts();
                dv = &bspDrawVerts[ numBSPDrawVerts - 1 ];