q3map2: fix not displaying default args for some q3map2 stages

Fix not displaying default arguments, and possibly segfaulting, when
running q3map2 -bsp, -analyze, -convert, -exportents, -export, or
-import.

diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c
index 3ab6a2df9a54210e68b4cc515607de24a01ef64e..f926a8dda84d993d9983d759ee7d81734cd4891d 100644 (file)
--- a/tools/quake3/q3map2/bsp.c
+++ b/tools/quake3/q3map2/bsp.c
@@ -709,6 +709,11 @@ int BSPMain( int argc, char **argv ){
        portalFilePath[0] = 0;
        surfaceFilePath[0] = 0;
 
+       if ( argc >= 2 && !strcmp( argv[ 1 ], "-bsp" ) ) {
+               Sys_Printf( "-bsp argument unnecessary\n" );
+               argv++;
+               argc--;
+       }
 
        /* note it */
        Sys_Printf( "--- BSP ---\n" );
@@ -1010,9 +1015,6 @@ int BSPMain( int argc, char **argv ){
                        i++;
                        Sys_Printf( "Use %s as surface file\n", surfaceFilePath );
                }
-               else if ( !strcmp( argv[ i ], "-bsp" ) ) {
-                       Sys_Printf( "-bsp argument unnecessary\n" );
-               }
                else{
                        Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] );
                }

diff --git a/tools/quake3/q3map2/bsp_analyze.c b/tools/quake3/q3map2/bsp_analyze.c
index e84439d3599037d40057e4d73872c4a1af30460f..08575f3271f9e639f160594f61ac335de89a8bfa 100644 (file)
--- a/tools/quake3/q3map2/bsp_analyze.c
+++ b/tools/quake3/q3map2/bsp_analyze.c
@@ -83,7 +83,7 @@ int AnalyzeBSPMain( int argc, char **argv ){
 
 
        /* arg checking */
-       if ( argc < 1 ) {
+       if ( argc < 2 ) {
                Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
                return 0;
        }

diff --git a/tools/quake3/q3map2/convert_bsp.c b/tools/quake3/q3map2/convert_bsp.c
index 9db3260954f45cdaf5950eca08fb53ef6c67b533..87579d26e32561f28c2512ba66d242fef3ebe113 100644 (file)
--- a/tools/quake3/q3map2/convert_bsp.c
+++ b/tools/quake3/q3map2/convert_bsp.c
@@ -151,7 +151,7 @@ int ConvertBSPMain( int argc, char **argv ){
        force_map = qfalse;
 
        /* arg checking */
-       if ( argc < 1 ) {
+       if ( argc < 2 ) {
                Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
                return 0;
        }

diff --git a/tools/quake3/q3map2/exportents.c b/tools/quake3/q3map2/exportents.c
index b123660843acfc4cdfc7a962bf5d96c6bdae2cbc..50eed8978c66cc088820d73a7b4e1b319f5b226e 100644 (file)
--- a/tools/quake3/q3map2/exportents.c
+++ b/tools/quake3/q3map2/exportents.c
@@ -90,7 +90,7 @@ void ExportEntities( void ){
 
 int ExportEntitiesMain( int argc, char **argv ){
         /* arg checking */
-        if ( argc < 1 ) {
+        if ( argc < 2 ) {
                 Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" );
                 return 0;
         }
@@ -109,4 +109,4 @@ int ExportEntitiesMain( int argc, char **argv ){
                
         /* return to sender */
         return 0;
-}
\ No newline at end of file
+}

diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c
index 1b28ca06935e860ddefddc1b3e536f0f23870960..fc8dcced9867d56966b946c462e07ef40640d313 100644 (file)
--- a/tools/quake3/q3map2/lightmaps_ydnar.c
+++ b/tools/quake3/q3map2/lightmaps_ydnar.c
@@ -153,7 +153,7 @@ void ExportLightmaps( void ){
 
 int ExportLightmapsMain( int argc, char **argv ){
        /* arg checking */
-       if ( argc < 1 ) {
+       if ( argc < 2 ) {
                Sys_Printf( "Usage: q3map -export [-v] <mapname>\n" );
                return 0;
        }
@@ -188,7 +188,7 @@ int ImportLightmapsMain( int argc, char **argv ){
 
 
        /* arg checking */
-       if ( argc < 1 ) {
+       if ( argc < 2 ) {
                Sys_Printf( "Usage: q3map -import [-v] <mapname>\n" );
                return 0;
        }