]> de.git.xonotic.org Git - xonotic/netradiant.git/blobdiff - tools/quake3/q3map2/main.c
split bsp analyze/info/scale stuff from q3map2
[xonotic/netradiant.git] / tools / quake3 / q3map2 / main.c
index b9fb7d89ee839bd3bd362bf36b243fcf46133d47..20161484e690534b664df76794f6570782631e94 100644 (file)
@@ -1,30 +1,30 @@
 /* -------------------------------------------------------------------------------
 
-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.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
--------------------------------------------------------------------------------
+   -------------------------------------------------------------------------------
 
-This code has been altered significantly from its original form, to support
-several games based on the Quake III Arena engine, in the form of "Q3Map2."
+   This code has been altered significantly from its original form, to support
+   several games based on the Quake III Arena engine, in the form of "Q3Map2."
 
-------------------------------------------------------------------------------- */
+   ------------------------------------------------------------------------------- */
 
 
 
@@ -39,89 +39,112 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2."
 
 
 /*
-Random()
-returns a pseudorandom number between 0 and 1
-*/
+   Random()
+   returns a pseudorandom number between 0 and 1
+ */
 
-vec_t Random( void )
-{
+vec_t Random( void ){
        return (vec_t) rand() / RAND_MAX;
 }
 
 
+char *Q_strncpyz( char *dst, const char *src, size_t len ) {
+       if ( len == 0 ) {
+               abort();
+       }
 
-/*
-ExitQ3Map()
-cleanup routine
-*/
+       strncpy( dst, src, len );
+       dst[ len - 1 ] = '\0';
+       return dst;
+}
 
-static void ExitQ3Map( void )
-{
-       BSPFilesCleanup();
-       if( mapDrawSurfs != NULL )
-               free( mapDrawSurfs );
+
+char *Q_strcat( char *dst, size_t dlen, const char *src ) {
+       size_t n = strlen( dst  );
+
+       if ( n > dlen ) {
+               abort(); /* buffer overflow */
+       }
+
+       return Q_strncpyz( dst + n, src, dlen - n );
 }
 
 
+char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ) {
+       size_t n = strlen( dst );
+
+       if ( n > dlen ) {
+               abort(); /* buffer overflow */
+       }
+
+       return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) );
+}
 
 /*
-MD4BlockChecksum()
-calculates an md4 checksum for a block of data
-*/
+   ExitQ3Map()
+   cleanup routine
+ */
 
-static int MD4BlockChecksum( void *buffer, int length )
-{
-       return Com_BlockChecksum(buffer, length);
+static void ExitQ3Map( void ){
+       BSPFilesCleanup();
+       if ( mapDrawSurfs != NULL ) {
+               free( mapDrawSurfs );
+       }
 }
 
+/*
+   MD4BlockChecksum()
+   calculates an md4 checksum for a block of data
+ */
 
+static int MD4BlockChecksum( void *buffer, int length ){
+       return Com_BlockChecksum( buffer, length );
+}
 
 /*
-FixAAS()
-resets an aas checksum to match the given BSP
-*/
-
-int FixAAS( int argc, char **argv )
-{
-       int                     length, checksum;
-       void            *buffer;
-       FILE            *file;
-       char            aas[ 1024 ], **ext;
-       char            *exts[] =
-                               {
-                                       ".aas",
-                                       "_b0.aas",
-                                       "_b1.aas",
-                                       NULL
-                               };
-       
-       
-       /* arg checking */
-       if( argc < 2 )
+   FixAAS()
+   resets an aas checksum to match the given BSP
+ */
+
+int FixAAS( int argc, char **argv ){
+       int length, checksum;
+       void        *buffer;
+       FILE        *file;
+       char aas[ 1024 ], **ext;
+       char        *exts[] =
        {
+               ".aas",
+               "_b0.aas",
+               "_b1.aas",
+               NULL
+       };
+
+
+       /* arg checking */
+       if ( argc < 2 ) {
                Sys_Printf( "Usage: q3map -fixaas [-v] <mapname>\n" );
                return 0;
        }
-       
+
        /* do some path mangling */
        strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
        StripExtension( source );
        DefaultExtension( source, ".bsp" );
-       
+
        /* note it */
        Sys_Printf( "--- FixAAS ---\n" );
-       
+
        /* load the bsp */
        Sys_Printf( "Loading %s\n", source );
        length = LoadFile( source, &buffer );
-       
+
        /* create bsp checksum */
        Sys_Printf( "Creating checksum...\n" );
        checksum = LittleLong( MD4BlockChecksum( buffer, length ) );
-       
+
        /* write checksum to aas */
        ext = exts;
-       while( *ext )
+       while ( *ext )
        {
                /* mangle name */
                strcpy( aas, source );
@@ -129,528 +152,96 @@ int FixAAS( int argc, char **argv )
                strcat( aas, *ext );
                Sys_Printf( "Trying %s\n", aas );
                ext++;
-               
+
                /* fix it */
                file = fopen( aas, "r+b" );
-               if( !file )
+               if ( !file ) {
                        continue;
-               if( fwrite( &checksum, 4, 1, file ) != 1 )
-                       Error( "Error writing checksum to %s", aas );
-               fclose( file );
-       }
-       
-       /* return to sender */
-       return 0;
-}
-
-
-
-/*
-AnalyzeBSP() - ydnar
-analyzes a Quake engine BSP file
-*/
-
-typedef struct abspHeader_s
-{
-       char                    ident[ 4 ];
-       int                             version;
-       
-       bspLump_t               lumps[ 1 ];     /* unknown size */
-}
-abspHeader_t;
-
-typedef struct abspLumpTest_s
-{
-       int                             radix, minCount;
-       char                    *name;
-}
-abspLumpTest_t;
-
-int AnalyzeBSP( int argc, char **argv )
-{
-       abspHeader_t                    *header;
-       int                                             size, i, version, offset, length, lumpInt, count;
-       char                                    ident[ 5 ];
-       void                                    *lump;
-       float                                   lumpFloat;
-       char                                    lumpString[ 1024 ], source[ 1024 ];
-       qboolean                                lumpSwap = qfalse;
-       abspLumpTest_t                  *lumpTest;
-       static abspLumpTest_t   lumpTests[] =
-                                                       {
-                                                               { sizeof( bspPlane_t ),                 6,              "IBSP LUMP_PLANES" },
-                                                               { sizeof( bspBrush_t ),                 1,              "IBSP LUMP_BRUSHES" },
-                                                               { 8,                                                    6,              "IBSP LUMP_BRUSHSIDES" },
-                                                               { sizeof( bspBrushSide_t ),             6,              "RBSP LUMP_BRUSHSIDES" },
-                                                               { sizeof( bspModel_t ),                 1,              "IBSP LUMP_MODELS" },
-                                                               { sizeof( bspNode_t ),                  2,              "IBSP LUMP_NODES" },
-                                                               { sizeof( bspLeaf_t ),                  1,              "IBSP LUMP_LEAFS" },
-                                                               { 104,                                                  3,              "IBSP LUMP_DRAWSURFS" },
-                                                               { 44,                                                   3,              "IBSP LUMP_DRAWVERTS" },
-                                                               { 4,                                                    6,              "IBSP LUMP_DRAWINDEXES" },
-                                                               { 128 * 128 * 3,                                1,              "IBSP LUMP_LIGHTMAPS" },
-                                                               { 256 * 256 * 3,                                1,              "IBSP LUMP_LIGHTMAPS (256 x 256)" },
-                                                               { 512 * 512 * 3,                                1,              "IBSP LUMP_LIGHTMAPS (512 x 512)" },
-                                                               { 0, 0, NULL }
-                                                       };
-       
-       
-       /* arg checking */
-       if( argc < 1 )
-       {
-               Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
-               return 0;
-       }
-       
-       /* process arguments */
-       for( i = 1; i < (argc - 1); i++ )
-       {
-               /* -format map|ase|... */
-               if( !strcmp( argv[ i ],  "-lumpswap" ) )
-               {
-                       Sys_Printf( "Swapped lump structs enabled\n" );
-                       lumpSwap = qtrue;
-               }
-       }
-       
-       /* clean up map name */
-       strcpy( source, ExpandArg( argv[ i ] ) );
-       Sys_Printf( "Loading %s\n", source );
-       
-       /* load the file */
-       size = LoadFile( source, (void**) &header );
-       if( size == 0 || header == NULL )
-       {
-               Sys_Printf( "Unable to load %s.\n", source );
-               return -1;
-       }
-       
-       /* analyze ident/version */
-       memcpy( ident, header->ident, 4 );
-       ident[ 4 ] = '\0';
-       version = LittleLong( header->version );
-       
-       Sys_Printf( "Identity:      %s\n", ident );
-       Sys_Printf( "Version:       %d\n", version );
-       Sys_Printf( "---------------------------------------\n" );
-       
-       /* analyze each lump */
-       for( i = 0; i < 100; i++ )
-       {
-               /* call of duty swapped lump pairs */
-               if( lumpSwap )
-               {
-                       offset = LittleLong( header->lumps[ i ].length );
-                       length = LittleLong( header->lumps[ i ].offset );
                }
-               
-               /* standard lump pairs */
-               else
-               {
-                       offset = LittleLong( header->lumps[ i ].offset );
-                       length = LittleLong( header->lumps[ i ].length );
-               }
-               
-               /* extract data */
-               lump = (byte*) header + offset;
-               lumpInt = LittleLong( (int) *((int*) lump) );
-               lumpFloat = LittleFloat( (float) *((float*) lump) );
-               memcpy( lumpString, (char*) lump, (length < 1024 ? length : 1024) );
-               lumpString[ 1024 ] = '\0';
-               
-               /* print basic lump info */
-               Sys_Printf( "Lump:          %d\n", i );
-               Sys_Printf( "Offset:        %d bytes\n", offset );
-               Sys_Printf( "Length:        %d bytes\n", length );
-               
-               /* only operate on valid lumps */
-               if( length > 0 )
-               {
-                       /* print data in 4 formats */
-                       Sys_Printf( "As hex:        %08X\n", lumpInt );
-                       Sys_Printf( "As int:        %d\n", lumpInt );
-                       Sys_Printf( "As float:      %f\n", lumpFloat );
-                       Sys_Printf( "As string:     %s\n", lumpString );
-                       
-                       /* guess lump type */
-                       if( lumpString[ 0 ] == '{' && lumpString[ 2 ] == '"' )
-                               Sys_Printf( "Type guess:    IBSP LUMP_ENTITIES\n" );
-                       else if( strstr( lumpString, "textures/" ) )
-                               Sys_Printf( "Type guess:    IBSP LUMP_SHADERS\n" );
-                       else
-                       {
-                               /* guess based on size/count */
-                               for( lumpTest = lumpTests; lumpTest->radix > 0; lumpTest++ )
-                               {
-                                       if( (length % lumpTest->radix) != 0 )
-                                               continue;
-                                       count = length / lumpTest->radix;
-                                       if( count < lumpTest->minCount )
-                                               continue;
-                                       Sys_Printf( "Type guess:    %s (%d x %d)\n", lumpTest->name, count, lumpTest->radix );
-                               }
-                       }
-               }
-               
-               Sys_Printf( "---------------------------------------\n" );
-               
-               /* end of file */
-               if( offset + length >= size )
-                       break;
-       }
-       
-       /* last stats */
-       Sys_Printf( "Lump count:    %d\n", i + 1 );
-       Sys_Printf( "File size:     %d bytes\n", size );
-       
-       /* return to caller */
-       return 0;
-}
-
-
-
-/*
-BSPInfo()
-emits statistics about the bsp file
-*/
-
-int BSPInfo( int count, char **fileNames )
-{
-       int                     i;
-       char            source[ 1024 ], ext[ 64 ];
-       int                     size;
-       FILE            *f;
-       
-       
-       /* dummy check */
-       if( count < 1 )
-       {
-               Sys_Printf( "No files to dump info for.\n");
-               return -1;
-       }
-       
-       /* enable info mode */
-       infoMode = qtrue;
-       
-       /* walk file list */
-       for( i = 0; i < count; i++ )
-       {
-               Sys_Printf( "---------------------------------\n" );
-               
-               /* mangle filename and get size */
-               strcpy( source, fileNames[ i ] );
-               ExtractFileExtension( source, ext );
-               if( !Q_stricmp( ext, "map" ) )
-                       StripExtension( source );
-               DefaultExtension( source, ".bsp" );
-               f = fopen( source, "rb" );
-               if( f )
-               {
-                       size = Q_filelength (f);
-                       fclose( f );
+               if ( fwrite( &checksum, 4, 1, file ) != 1 ) {
+                       Error( "Error writing checksum to %s", aas );
                }
-               else
-                       size = 0;
-               
-               /* load the bsp file and print lump sizes */
-               Sys_Printf( "%s\n", source );
-               LoadBSPFile( source );          
-               PrintBSPFileSizes();
-               
-               /* print sizes */
-               Sys_Printf( "\n" );
-               Sys_Printf( "          total         %9d\n", size );
-               Sys_Printf( "                        %9d KB\n", size / 1024 );
-               Sys_Printf( "                        %9d MB\n", size / (1024 * 1024) );
-               
-               Sys_Printf( "---------------------------------\n" );
+               fclose( file );
        }
-       
-       /* return count */
-       return i;
-}
-
-
 
-/*
-ScaleBSPMain()
-amaze and confuse your enemies with wierd scaled maps!
-*/
-
-int ScaleBSPMain( int argc, char **argv )
-{
-       int                     i;
-       float           f, scale;
-       vec3_t          vec;
-       char            str[ 1024 ];
-       
-       
-       /* arg checking */
-       if( argc < 2 )
-       {
-               Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
-               return 0;
-       }
-       
-       /* get scale */
-       scale = atof( argv[ argc - 2 ] );
-       if( scale == 0.0f )
-       {
-               Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
-               Sys_Printf( "Non-zero scale value required.\n" );
-               return 0;
-       }
-       
-       /* do some path mangling */
-       strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
-       StripExtension( source );
-       DefaultExtension( source, ".bsp" );
-       
-       /* load the bsp */
-       Sys_Printf( "Loading %s\n", source );
-       LoadBSPFile( source );
-       ParseEntities();
-       
-       /* note it */
-       Sys_Printf( "--- ScaleBSP ---\n" );
-       Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities );
-       
-       /* scale entity keys */
-       for( i = 0; i < numBSPEntities && i < numEntities; i++ )
-       {
-               /* scale origin */
-               GetVectorForKey( &entities[ i ], "origin", vec );
-               if( (vec[ 0 ] + vec[ 1 ] + vec[ 2 ]) )
-               {
-                       VectorScale( vec, scale, vec );
-                       sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
-                       SetKeyValue( &entities[ i ], "origin", str );
-               }
-               
-               /* scale door lip */
-               f = FloatForKey( &entities[ i ], "lip" );
-               if( f )
-               {
-                       f *= scale;
-                       sprintf( str, "%f", f );
-                       SetKeyValue( &entities[ i ], "lip", str );
-               }
-       }
-       
-       /* scale models */
-       for( i = 0; i < numBSPModels; i++ )
-       {
-               VectorScale( bspModels[ i ].mins, scale, bspModels[ i ].mins );
-               VectorScale( bspModels[ i ].maxs, scale, bspModels[ i ].maxs );
-       }
-       
-       /* scale nodes */
-       for( i = 0; i < numBSPNodes; i++ )
-       {
-               VectorScale( bspNodes[ i ].mins, scale, bspNodes[ i ].mins );
-               VectorScale( bspNodes[ i ].maxs, scale, bspNodes[ i ].maxs );
-       }
-       
-       /* scale leafs */
-       for( i = 0; i < numBSPLeafs; i++ )
-       {
-               VectorScale( bspLeafs[ i ].mins, scale, bspLeafs[ i ].mins );
-               VectorScale( bspLeafs[ i ].maxs, scale, bspLeafs[ i ].maxs );
-       }
-       
-       /* scale drawverts */
-       for( i = 0; i < numBSPDrawVerts; i++ )
-               VectorScale( bspDrawVerts[ i ].xyz, scale, bspDrawVerts[ i ].xyz );
-       
-       /* scale planes */
-       for( i = 0; i < numBSPPlanes; i++ )
-               bspPlanes[ i ].dist *= scale;
-       
-       /* scale gridsize */
-       GetVectorForKey( &entities[ 0 ], "gridsize", vec );
-       if( (vec[ 0 ] + vec[ 1 ] + vec[ 2 ]) == 0.0f )
-               VectorCopy( gridSize, vec );
-       VectorScale( vec, scale, vec );
-       sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
-       SetKeyValue( &entities[ 0 ], "gridsize", str );
-       
-       /* write the bsp */
-       UnparseEntities();
-       StripExtension( source );
-       DefaultExtension( source, "_s.bsp" );
-       Sys_Printf( "Writing %s\n", source );
-       WriteBSPFile( source );
-       
        /* return to sender */
        return 0;
 }
 
-
-
 /*
-ConvertBSPMain()
-main argument processing function for bsp conversion
-*/
-
-int ConvertBSPMain( int argc, char **argv )
-{
-       int             i;
-       int             (*convertFunc)( char * );
-       game_t  *convertGame;
-       
-       
-       /* set default */
-       convertFunc = ConvertBSPToASE;
-       convertGame = NULL;
-       
-       /* arg checking */
-       if( argc < 1 )
-       {
-               Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
-               return 0;
-       }
-       
-       /* process arguments */
-       for( i = 1; i < (argc - 1); i++ )
-       {
-               /* -format map|ase|... */
-               if( !strcmp( argv[ i ],  "-format" ) )
-               {
-                       i++;
-                       if( !Q_stricmp( argv[ i ], "ase" ) )
-                               convertFunc = ConvertBSPToASE;
-                       else if( !Q_stricmp( argv[ i ], "map" ) )
-                               convertFunc = ConvertBSPToMap;
-                       else
-                       {
-                               convertGame = GetGame( argv[ i ] );
-                               if( convertGame == NULL )
-                                       Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
-                       }
-               }
-               else if( !strcmp( argv[ i ],  "-ne" ) )
-               {
-                       normalEpsilon = atof( argv[ i + 1 ] );
-                       i++;
-                       Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon );
-               }
-               else if( !strcmp( argv[ i ],  "-de" ) )
-               {
-                       distanceEpsilon = atof( argv[ i + 1 ] );
-                       i++;
-                       Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
-               }
-       }
-       
-       /* clean up map name */
-       strcpy( source, ExpandArg( argv[ i ] ) );
-       StripExtension( source );
-       DefaultExtension( source, ".bsp" );
-       
-       LoadShaderInfo();
-       
-       Sys_Printf( "Loading %s\n", source );
-       
-       /* ydnar: load surface file */
-       //%     LoadSurfaceExtraFile( source );
-       
-       LoadBSPFile( source );
-       
-       /* parse bsp entities */
-       ParseEntities();
-       
-       /* bsp format convert? */
-       if( convertGame != NULL )
-       {
-               /* set global game */
-               game = convertGame;
-               
-               /* write bsp */
-               StripExtension( source );
-               DefaultExtension( source, "_c.bsp" );
-               Sys_Printf( "Writing %s\n", source );
-               WriteBSPFile( source );
-               
-               /* return to sender */
-               return 0;
-       }
-       
-       /* normal convert */
-       return convertFunc( source );
-}
+   main()
+   q3map mojo...
+ */
 
+int main( int argc, char **argv ){
+       int i, r;
+       double start, end;
 
 
-/*
-main()
-q3map mojo...
-*/
-
-int main( int argc, char **argv )
-{
-       int             i, r;
-       double  start, end;
-       
-       
        /* we want consistent 'randomness' */
        srand( 0 );
-       
+
        /* start timer */
        start = I_FloatTime();
 
        /* this was changed to emit version number over the network */
        printf( Q3MAP_VERSION "\n" );
-       
+
        /* set exit call */
        atexit( ExitQ3Map );
-       
+
        /* read general options first */
-       for( i = 1; i < argc; i++ )
+       for ( i = 1; i < argc; i++ )
        {
+               /* -help */
+               if ( !strcmp( argv[ i ], "-h" ) || !strcmp( argv[ i ], "--help" )
+                       || !strcmp( argv[ i ], "-help" ) ) {
+                       HelpMain(argv[i+1]);
+                       return 0;
+               }
+
                /* -connect */
-               if( !strcmp( argv[ i ], "-connect" ) )
-               {
+               if ( !strcmp( argv[ i ], "-connect" ) ) {
                        argv[ i ] = NULL;
                        i++;
                        Broadcast_Setup( argv[ i ] );
                        argv[ i ] = NULL;
                }
-               
+
                /* verbose */
-               else if( !strcmp( argv[ i ], "-v" ) )
-               {
-                       verbose = qtrue;
-                       argv[ i ] = NULL;
+               else if ( !strcmp( argv[ i ], "-v" ) ) {
+                       if ( !verbose ) {
+                               verbose = qtrue;
+                               argv[ i ] = NULL;
+                       }
                }
-               
+
                /* force */
-               else if( !strcmp( argv[ i ], "-force" ) )
-               {
+               else if ( !strcmp( argv[ i ], "-force" ) ) {
                        force = qtrue;
                        argv[ i ] = NULL;
                }
-               
+
                /* patch subdivisions */
-               else if( !strcmp( argv[ i ], "-subdivisions" ) )
-               {
+               else if ( !strcmp( argv[ i ], "-subdivisions" ) ) {
                        argv[ i ] = NULL;
                        i++;
                        patchSubdivisions = atoi( argv[ i ] );
                        argv[ i ] = NULL;
-                       if( patchSubdivisions <= 0 )
+                       if ( patchSubdivisions <= 0 ) {
                                patchSubdivisions = 1;
+                       }
                }
-               
+
                /* threads */
-               else if( !strcmp( argv[ i ], "-threads" ) )
-               {
+               else if ( !strcmp( argv[ i ], "-threads" ) ) {
                        argv[ i ] = NULL;
                        i++;
                        numthreads = atoi( argv[ i ] );
                        argv[ i ] = NULL;
                }
        }
-       
+
        /* init model library */
        PicoInit();
        PicoSetMallocFunc( safe_malloc );
@@ -658,87 +249,107 @@ int main( int argc, char **argv )
        PicoSetPrintFunc( PicoPrintFunc );
        PicoSetLoadFileFunc( PicoLoadFileFunc );
        PicoSetFreeFileFunc( free );
-       
+
        /* set number of threads */
        ThreadSetDefault();
-       
+
        /* generate sinusoid jitter table */
-       for( i = 0; i < MAX_JITTERS; i++ )
+       for ( i = 0; i < MAX_JITTERS; i++ )
        {
                jitters[ i ] = sin( i * 139.54152147 );
                //%     Sys_Printf( "Jitter %4d: %f\n", i, jitters[ i ] );
        }
-       
+
        /* we print out two versions, q3map's main version (since it evolves a bit out of GtkRadiant)
           and we put the GtkRadiant version to make it easy to track with what version of Radiant it was built with */
-       
+
        Sys_Printf( "Q3Map         - v1.0r (c) 1999 Id Software Inc.\n" );
        Sys_Printf( "Q3Map (ydnar) - v" Q3MAP_VERSION "\n" );
        Sys_Printf( "NetRadiant    - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
        Sys_Printf( "%s\n", Q3MAP_MOTD );
-       
+
        /* ydnar: new path initialization */
        InitPaths( &argc, argv );
-       
+
+       /* set game options */
+       if ( !patchSubdivisions ) {
+               patchSubdivisions = game->patchSubdivisions;
+       }
+
        /* check if we have enough options left to attempt something */
-       if( argc < 2 )
+       if ( argc < 2 ) {
                Error( "Usage: %s [general options] [options] mapfile", argv[ 0 ] );
-       
+       }
+
        /* fixaas */
-       if( !strcmp( argv[ 1 ], "-fixaas" ) )
+       if ( !strcmp( argv[ 1 ], "-fixaas" ) ) {
                r = FixAAS( argc - 1, argv + 1 );
-       
+       }
+
        /* analyze */
-       else if( !strcmp( argv[ 1 ], "-analyze" ) )
-               r = AnalyzeBSP( argc - 1, argv + 1 );
-       
+       else if ( !strcmp( argv[ 1 ], "-analyze" ) ) {
+               r = AnalyzeBSPMain( argc - 1, argv + 1 );
+       }
+
        /* info */
-       else if( !strcmp( argv[ 1 ], "-info" ) )
-               r = BSPInfo( argc - 2, argv + 2 );
-       
+       else if ( !strcmp( argv[ 1 ], "-info" ) ) {
+               r = BSPInfoMain( argc - 2, argv + 2 );
+       }
+
        /* vis */
-       else if( !strcmp( argv[ 1 ], "-vis" ) )
+       else if ( !strcmp( argv[ 1 ], "-vis" ) ) {
                r = VisMain( argc - 1, argv + 1 );
-       
+       }
+
        /* light */
-       else if( !strcmp( argv[ 1 ], "-light" ) )
+       else if ( !strcmp( argv[ 1 ], "-light" ) ) {
                r = LightMain( argc - 1, argv + 1 );
-       
+       }
+
        /* vlight */
-       else if( !strcmp( argv[ 1 ], "-vlight" ) )
-       {
+       else if ( !strcmp( argv[ 1 ], "-vlight" ) ) {
                Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" );
-               argv[ 1 ] = "-fast";    /* eek a hack */
+               argv[ 1 ] = "-fast";    /* eek a hack */
                r = LightMain( argc, argv );
        }
-       
+
        /* ydnar: lightmap export */
-       else if( !strcmp( argv[ 1 ], "-export" ) )
+       else if ( !strcmp( argv[ 1 ], "-export" ) ) {
                r = ExportLightmapsMain( argc - 1, argv + 1 );
-       
+       }
+
        /* ydnar: lightmap import */
-       else if( !strcmp( argv[ 1 ], "-import" ) )
+       else if ( !strcmp( argv[ 1 ], "-import" ) ) {
                r = ImportLightmapsMain( argc - 1, argv + 1 );
-       
+       }
+
        /* ydnar: bsp scaling */
-       else if( !strcmp( argv[ 1 ], "-scale" ) )
+       else if ( !strcmp( argv[ 1 ], "-scale" ) ) {
                r = ScaleBSPMain( argc - 1, argv + 1 );
-       
+       }
+
        /* ydnar: bsp conversion */
-       else if( !strcmp( argv[ 1 ], "-convert" ) )
+       else if ( !strcmp( argv[ 1 ], "-convert" ) ) {
                r = ConvertBSPMain( argc - 1, argv + 1 );
-       
+       }
+
+       /* div0: minimap */
+       else if ( !strcmp( argv[ 1 ], "-minimap" ) ) {
+               r = MiniMapBSPMain( argc - 1, argv + 1 );
+       }
+
        /* ydnar: otherwise create a bsp */
-       else
+       else{
                r = BSPMain( argc, argv );
-       
+       }
+
        /* emit time */
        end = I_FloatTime();
        Sys_Printf( "%9.0f seconds elapsed\n", end - start );
-       
+
        /* shut down connection */
        Broadcast_Shutdown();
-       
+
        /* return any error code */
        return r;
 }