fix two other bugs in the same function

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

diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.c
index 96210d4d2b1ad75243627b15ad14d115fd54fc54..f274f9580a38cff8791ce0608e5b119093272234 100644 (file)
--- a/tools/quake3/q3map2/tjunction.c
+++ b/tools/quake3/q3map2/tjunction.c
@@ -516,7 +516,6 @@ int         c_broken = 0;
 
 qboolean FixBrokenSurface( mapDrawSurface_t *ds )
 {
 
 qboolean FixBrokenSurface( mapDrawSurface_t *ds )
 {

-       qboolean        valid = qtrue;

        bspDrawVert_t   *dv1, *dv2, avg;
        int                     i, j, k;
        float           dist;
        bspDrawVert_t   *dv1, *dv2, avg;
        int                     i, j, k;
        float           dist;


@@ -531,10 +530,6 @@ qboolean FixBrokenSurface( mapDrawSurface_t *ds )
        /* check all verts */
        for( i = 0; i < ds->numVerts; i++ )
        {
        /* check all verts */
        for( i = 0; i < ds->numVerts; i++ )
        {

-               /* don't remove points if winding is a triangle */
-               if( ds->numVerts == 3 )
-                       return valid;
-               

                /* get verts */
                dv1 = &ds->verts[ i ];
                dv2 = &ds->verts[ (i + 1) % ds->numVerts ];
                /* get verts */
                dv1 = &ds->verts[ i ];
                dv2 = &ds->verts[ (i + 1) % ds->numVerts ];


@@ -544,7 +539,6 @@ qboolean FixBrokenSurface( mapDrawSurface_t *ds )
                dist = VectorLength( avg.xyz );
                if( dist < DEGENERATE_EPSILON )
                {
                dist = VectorLength( avg.xyz );
                if( dist < DEGENERATE_EPSILON )
                {

-                       //valid = qfalse; // no, valid = qfalse is only done if less than 3 verts are left

                        Sys_FPrintf( SYS_VRB, "WARNING: Degenerate T-junction edge found, fixing...\n" );
 
                        /* create an average drawvert */
                        Sys_FPrintf( SYS_VRB, "WARNING: Degenerate T-junction edge found, fixing...\n" );
 
                        /* create an average drawvert */


@@ -578,13 +572,16 @@ qboolean FixBrokenSurface( mapDrawSurface_t *ds )
                                memcpy( dv2, dv1, sizeof( bspDrawVert_t ) );
                        }
                        ds->numVerts--;
                                memcpy( dv2, dv1, sizeof( bspDrawVert_t ) );
                        }
                        ds->numVerts--;

+                       
+                       /* after welding, we have to consider the same vertex again, as it now has a new neighbor dv2 */
+                       --i;
+
+                       /* should ds->numVerts have become 0, then i is now -1. In the next iteration, the loop will abort. */

                }
        }
        
        /* one last check and return */
                }
        }
        
        /* one last check and return */

-       if( ds->numVerts < 3 )
-               valid = qfalse;
-       return valid;
+       return ds->numVerts >= 3;

 }
 
 
 }