tools: reduce diff noise

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

diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c
index 8a9dcdcaa83e42cb1e155e145b640474b9785c27..c6400cbc1ac3fc4859e2e917a34b3516b7c754bb 100644 (file)
--- a/tools/quake3/q3map2/brush.c
+++ b/tools/quake3/q3map2/brush.c
@@ -93,7 +93,6 @@ brush_t *AllocBrush( int numSides ){
        brush_t     *bb;
        size_t c;
 
-
        /* allocate and clear */
        if ( numSides <= 0 ) {
                Error( "AllocBrush called with numsides = %d", numSides );
@@ -256,7 +255,7 @@ void SnapWeldVector( vec3_t a, vec3_t b, vec3_t out ){
        {
                /* round to integer */
                ai = Q_rint( a[ i ] );
-               bi = Q_rint( a[ i ] );
+               bi = Q_rint( b[ i ] );
 
                /* prefer exact integer */
                if ( ai == a[ i ] ) {
@@ -267,7 +266,7 @@ void SnapWeldVector( vec3_t a, vec3_t b, vec3_t out ){
                }
 
                /* use nearest */
-               else if ( fabs( ai - a[ i ] ) < fabs( bi < b[ i ] ) ) {
+               else if ( fabs( ai - a[ i ] ) < fabs( bi - b[ i ] ) ) {
                        out[ i ] = a[ i ];
                }
                else{
@@ -282,6 +281,8 @@ void SnapWeldVector( vec3_t a, vec3_t b, vec3_t out ){
        }
 }
 
+
+
 /*
    ==================
    SnapWeldVectorAccu
@@ -1043,7 +1044,8 @@ void SplitBrush( brush_t *brush, int planenum, brush_t **front, brush_t **back )
                if ( !w ) {
                        continue;
                }
-               ClipWindingEpsilon( w, plane->normal, plane->dist,
+               /* strict, in parallel case we get the face back because it also is the midwinding */
+               ClipWindingEpsilonStrict( w, plane->normal, plane->dist,
                                                        0 /*PLANESIDE_EPSILON*/, &cw[0], &cw[1] );
                for ( j = 0 ; j < 2 ; j++ )
                {