add option -nofastpoint; make old buggy behaviour default as it is typically a lot...

[xonotic/netradiant.git] / tools / quake3 / q3map2 / map.c

diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c
index fcb6ac7d19aaa9ee5781f2f4fe99161664521341..12892573c354fd9c8b6e5b0349703117b2e75686 100644 (file)
--- a/tools/quake3/q3map2/map.c
+++ b/tools/quake3/q3map2/map.c
@@ -159,7 +159,7 @@ Returns qtrue if and only if the normal was adjusted.
 
 qboolean SnapNormal( vec3_t normal )
 {
-#if EXPERIMENTAL_SNAP_NORMAL_FIX
+#if Q3MAP2_EXPERIMENTAL_SNAP_NORMAL_FIX
        int             i;
        qboolean        adjusted = qfalse;
 
@@ -340,7 +340,7 @@ int FindFloatPlane( vec3_t innormal, vec_t dist, int numPoints, vec3_t *points )
        vec3_t normal;
 
        VectorCopy(innormal, normal);
-#if EXPERIMENTAL_SNAP_PLANE_FIX
+#if Q3MAP2_EXPERIMENTAL_SNAP_PLANE_FIX
        SnapPlaneImproved(normal, &dist, numPoints, (const vec3_t *) points);
 #else
        SnapPlane( normal, &dist );
@@ -395,7 +395,7 @@ int FindFloatPlane( vec3_t innormal, vec_t dist, int numPoints, vec3_t *points )
        vec3_t normal;
        
        VectorCopy(innormal, normal);
-#if EXPERIMENTAL_SNAP_PLANE_FIX
+#if Q3MAP2_EXPERIMENTAL_SNAP_PLANE_FIX
        SnapPlaneImproved(normal, &dist, numPoints, (const vec3_t *) points);
 #else
        SnapPlane( normal, &dist );
@@ -438,7 +438,7 @@ takes 3 points and finds the plane they lie in
 
 int MapPlaneFromPoints( vec3_t *p )
 {
-#if EXPERIMENTAL_HIGH_PRECISION_MATH_Q3MAP2_FIXES
+#if Q3MAP2_EXPERIMENTAL_HIGH_PRECISION_MATH_FIXES
        vec3_accu_t     paccu[3];
        vec3_accu_t     t1, t2, normalAccu;
        vec3_t          normal;
@@ -490,7 +490,7 @@ void SetBrushContents( brush_t *b )
        int                     contentFlags, compileFlags;
        side_t          *s;
        int                     i;
-       qboolean        mixed;
+       //%     qboolean        mixed;
        
        
        /* get initial compile flags from first side */
@@ -498,7 +498,7 @@ void SetBrushContents( brush_t *b )
        contentFlags = s->contentFlags;
        compileFlags = s->compileFlags;
        b->contentShader = s->shaderInfo;
-       mixed = qfalse;
+       //%     mixed = qfalse;
        
        /* get the content/compile flags for every side in the brush */
        for( i = 1; i < b->numsides; i++, s++ )
@@ -506,8 +506,8 @@ void SetBrushContents( brush_t *b )
                s = &b->sides[ i ];
                if( s->shaderInfo == NULL )
                        continue;
-               if( s->contentFlags != contentFlags || s->compileFlags != compileFlags )
-                       mixed = qtrue;
+               //%     if( s->contentFlags != contentFlags || s->compileFlags != compileFlags )
+               //%             mixed = qtrue;
 
                contentFlags |= s->contentFlags;
                compileFlags |= s->compileFlags;
@@ -1196,9 +1196,6 @@ parses a brush out of a map file and sets it up
 
 static void ParseBrush( qboolean onlyLights, qboolean noCollapseGroups )
 {
-       brush_t *b;
-       
-       
        /* parse the brush out of the map */
        ParseRawBrush( onlyLights );
        
@@ -1241,7 +1238,7 @@ static void ParseBrush( qboolean onlyLights, qboolean noCollapseGroups )
        }
        
        /* finish the brush */
-       b = FinishBrush(noCollapseGroups);
+       FinishBrush(noCollapseGroups);
 }
 
 
@@ -1606,8 +1603,7 @@ static qboolean ParseMapEntity( qboolean onlyLights, qboolean noCollapseGroups )
        }
        
        /* range check */
-       if( numEntities >= MAX_MAP_ENTITIES )
-               Error( "numEntities == MAX_MAP_ENTITIES" );
+       AUTOEXPAND_BY_REALLOC(entities, numEntities, allocatedEntities, 32);
        
        /* setup */
        entitySourceBrushes = 0;