quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

q3map2: fix not displaying default args for some q3map2 stages

Browse Source 
Fix not displaying default arguments, and possibly segfaulting, when
running q3map2 -bsp, -analyze, -convert, -exportents, -export, or
-import.
This commit is contained in:
Zack Middleton 2019-07-22 23:50:17 -05:00 committed by Garux
parent 19accfbbab
commit 9c60ebea68
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/quake3/q3map2/bsp.c
View File

@ -766,6 +766,11 @@ int BSPMain( int argc, char **argv ){
char path[ 1024 ], tempSource[ 1024 ]; char path[ 1024 ], tempSource[ 1024 ];
qboolean onlyents = qfalse; qboolean onlyents = qfalse;
if ( argc >= 2 && !strcmp( argv[ 1 ], "-bsp" ) ) {
Sys_Printf( "-bsp argument unnecessary\n" );
argv++;
argc--;
}
/* note it */ /* note it */
Sys_Printf( "--- BSP ---\n" ); Sys_Printf( "--- BSP ---\n" );
@ -1051,9 +1056,6 @@ int BSPMain( int argc, char **argv ){
Sys_Printf( "Max Area face surface generation enabled\n" ); Sys_Printf( "Max Area face surface generation enabled\n" );
maxAreaFaceSurface = qtrue; maxAreaFaceSurface = qtrue;
} }
else if ( !strcmp( argv[ i ], "-bsp" ) ) {
Sys_Printf( "-bsp argument unnecessary\n" );
}
else if ( !strcmp( argv[ i ], "-noob" ) ) { else if ( !strcmp( argv[ i ], "-noob" ) ) {
Sys_Printf( "No oBs!\n" ); Sys_Printf( "No oBs!\n" );
noob = qtrue; noob = qtrue;

4
tools/quake3/q3map2/convert_bsp.c
View File

@ -152,7 +152,7 @@ int AnalyzeBSP( int argc, char **argv ){
/* arg checking */ /* arg checking */
if ( argc < 1 ) { if ( argc < 2 ) {
Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" ); Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
return 0; return 0;
} }
@ -933,7 +933,7 @@ int ConvertBSPMain( int argc, char **argv ){
force_map = qfalse; force_map = qfalse;
/* arg checking */ /* 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" ); Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
return 0; return 0;
} }

2
tools/quake3/q3map2/exportents.c
View File

@ -90,7 +90,7 @@ void ExportEntities( void ){
int ExportEntitiesMain( int argc, char **argv ){ int ExportEntitiesMain( int argc, char **argv ){
/* arg checking */ /* arg checking */
if ( argc < 1 ) { if ( argc < 2 ) {
Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" ); Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" );
return 0; return 0;
} }

4
tools/quake3/q3map2/lightmaps_ydnar.c
View File

@ -154,7 +154,7 @@ void ExportLightmaps( void ){
int ExportLightmapsMain( int argc, char **argv ){ int ExportLightmapsMain( int argc, char **argv ){
/* arg checking */ /* arg checking */
if ( argc < 1 ) { if ( argc < 2 ) {
Sys_Printf( "Usage: q3map -export [-v] <mapname>\n" ); Sys_Printf( "Usage: q3map -export [-v] <mapname>\n" );
return 0; return 0;
} }
@ -189,7 +189,7 @@ int ImportLightmapsMain( int argc, char **argv ){
/* arg checking */ /* arg checking */
if ( argc < 1 ) { if ( argc < 2 ) {
Sys_Printf( "Usage: q3map -import [-v] <mapname>\n" ); Sys_Printf( "Usage: q3map -import [-v] <mapname>\n" );
return 0; return 0;
} }