Merge commit 'fe73dd74d0e40a33c090993390e4d5721a1f9e05' into garux-merge

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

diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.c
index 453b7531af5b277ea740c657cf9e15aae6dfb766..e189d0648af3f618ceb2818f47bf6d408aeeac1e 100644 (file)
--- a/tools/quake3/q3map2/surface_meta.c
+++ b/tools/quake3/q3map2/surface_meta.c
@@ -341,6 +341,7 @@ void TriangulatePatchSurface( entity_t *e, mapDrawSurface_t *ds ){
        if ( ds->numVerts == 0 || ds->type != SURFACE_PATCH || ( patchMeta == qfalse && !forcePatchMeta ) ) {
                return;
        }
+
        /* make a mesh from the drawsurf */
        src.width = ds->patchWidth;
        src.height = ds->patchHeight;
@@ -419,6 +420,8 @@ void TriangulatePatchSurface( entity_t *e, mapDrawSurface_t *ds ){
        ClassifySurfaces( 1, ds );
 }
 
+
+
 #define TINY_AREA 1.0f
 #define MAXAREA_MAXTRIES 8
 int MaxAreaIndexes( bspDrawVert_t *vert, int cnt, int *indexes ){
@@ -589,6 +592,8 @@ int MaxAreaIndexes( bspDrawVert_t *vert, int cnt, int *indexes ){
        return -1;
 }
 
+
+
 /*
    MaxAreaFaceSurface() - divVerent
    creates a triangle list using max area indexes
@@ -631,6 +636,7 @@ void MaxAreaFaceSurface( mapDrawSurface_t *ds ){
 }
 
 
+
 /*
    FanFaceSurface() - ydnar
    creates a tri-fan from a brush face winding
@@ -835,6 +841,7 @@ void StripFaceSurface( mapDrawSurface_t *ds ){
 }
 
 
+
 /*
    EmitMetaStatictics
    vortex: prints meta statistics in general output
@@ -851,6 +858,8 @@ void EmitMetaStats(){
        Sys_Printf( "%9d meta triangles\n", numMetaTriangles );
 }
 
+
+
 /*
    MakeEntityMetaTriangles()
    builds meta triangles from brush faces (tristrips and fans)
@@ -1469,8 +1478,6 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri,
                }
        }
 
-
-
        if ( metaMaxBBoxDistance >= 0 ) {
                if ( ds->numIndexes > 0 ) {
                        VectorCopy( ds->mins, mins );
@@ -1595,7 +1602,7 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri,
                         ( bi == ds->indexes[ i ] && ci == ds->indexes[ i + 2 ] && ai == ds->indexes[ i + 1 ] ) ||
                         ( ci == ds->indexes[ i ] && ai == ds->indexes[ i + 2 ] && bi == ds->indexes[ i + 1 ] ) ) {
                        /* warn about it */
-                       Sys_Printf( "WARNING: Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n",
+                       Sys_FPrintf( SYS_WRN, "WARNING: Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n",
                                                ds->verts[ ai ].xyz[ 0 ], ds->verts[ ai ].xyz[ 1 ], ds->verts[ ai ].xyz[ 2 ],
                                                ds->verts[ bi ].xyz[ 0 ], ds->verts[ bi ].xyz[ 1 ], ds->verts[ bi ].xyz[ 2 ],
                                                ds->verts[ ci ].xyz[ 0 ], ds->verts[ ci ].xyz[ 1 ], ds->verts[ ci ].xyz[ 2 ] );
@@ -1705,8 +1712,8 @@ static void MetaTrianglesToSurface( int numPossibles, metaTriangle_t *possibles,
                ClearBounds( ds->mins, ds->maxs );
 
                /* clear verts/indexes */
-               memset( verts, 0, sizeof( verts ) );
-               memset( indexes, 0, sizeof( indexes ) );
+               memset( verts, 0, sizeof( *verts ) * maxSurfaceVerts );
+               memset( indexes, 0, sizeof( *indexes ) * maxSurfaceIndexes );
 
                /* add the first triangle */
                if ( AddMetaTriangleToSurface( ds, seed, qfalse ) ) {