merge branch work back into trunk

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

diff --git a/tools/quake3/q3map2/writebsp.c b/tools/quake3/q3map2/writebsp.c
index 7fb51d83630e85baa920a8836f4f1107abfb2796..4cdd3a99e7b7c31a3c7c1d982cfbf7a14db73cd0 100644 (file)
--- a/tools/quake3/q3map2/writebsp.c
+++ b/tools/quake3/q3map2/writebsp.c
@@ -1,4 +1,5 @@
-/*
+/* -------------------------------------------------------------------------------
+

 Copyright (C) 1999-2007 id Software, Inc. and contributors.
 For a list of contributors, see the accompanying CONTRIBUTORS file.
 
 Copyright (C) 1999-2007 id Software, Inc. and contributors.
 For a list of contributors, see the accompanying CONTRIBUTORS file.
 


@@ -84,7 +85,7 @@ int   EmitShader( const char *shader, int *contentFlags, int *surfaceFlags )
                bspShaders[ i ].contentFlags = *contentFlags;
        
        /* recursively emit any damage shaders */
                bspShaders[ i ].contentFlags = *contentFlags;
        
        /* recursively emit any damage shaders */

-       if( si->damageShader[ 0 ] != '\0' )
+       if( si->damageShader != NULL && si->damageShader[ 0 ] != '\0' )

        {
                Sys_FPrintf( SYS_VRB, "Shader %s has damage shader %s\n", si->shader, si->damageShader );
                EmitShader( si->damageShader, NULL, NULL );
        {
                Sys_FPrintf( SYS_VRB, "Shader %s has damage shader %s\n", si->shader, si->damageShader );
                EmitShader( si->damageShader, NULL, NULL );


@@ -135,7 +136,6 @@ void EmitLeaf( node_t *node )
        bspLeaf_t               *leaf_p;
        brush_t                 *b;
        drawSurfRef_t   *dsr;
        bspLeaf_t               *leaf_p;
        brush_t                 *b;
        drawSurfRef_t   *dsr;

-       int                             i = 0;

 
        
        /* check limits */
 
        
        /* check limits */


@@ -157,7 +157,7 @@ void EmitLeaf( node_t *node )
        for( b = node->brushlist; b; b = b->next )
        {
                /* something is corrupting brushes */
        for( b = node->brushlist; b; b = b->next )
        {
                /* something is corrupting brushes */

-               if( (int) b < 256 )
+               if( (size_t) b < 256 )

                {
                        Sys_Printf( "WARNING: Node brush list corrupted (0x%08X)\n", b );
                        break;
                {
                        Sys_Printf( "WARNING: Node brush list corrupted (0x%08X)\n", b );
                        break;


@@ -400,6 +400,8 @@ void EndBSPFile( void )
        char    path[ 1024 ];
        
 
        char    path[ 1024 ];
        
 

+       Sys_FPrintf( SYS_VRB, "--- EndBSPFile ---\n" );
+

        EmitPlanes();
        
        numBSPEntities = numEntities;
        EmitPlanes();
        
        numBSPEntities = numEntities;


@@ -459,10 +461,6 @@ void EmitBrushes( brush_t *brushes, int *firstBrush, int *numBrushes )
                        /* set output number to bogus initially */
                        b->sides[ j ].outputNum = -1;
                        
                        /* set output number to bogus initially */
                        b->sides[ j ].outputNum = -1;
                        

-                       /* don't emit generated backSide sides */
-                       if ( b->sides[ j ].backSide )
-                               continue;
-                       

                        /* check count */
                        if( numBSPBrushSides == MAX_MAP_BRUSHSIDES )
                                Error( "MAX_MAP_BRUSHSIDES ");
                        /* check count */
                        if( numBSPBrushSides == MAX_MAP_BRUSHSIDES )
                                Error( "MAX_MAP_BRUSHSIDES ");