Fix not displaying default arguments, and possibly segfaulting, when
running q3map2 -bsp, -analyze, -convert, -exportents, -export, or
-import.
portalFilePath[0] = 0;
surfaceFilePath[0] = 0;
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" );
/* note it */
Sys_Printf( "--- BSP ---\n" );
i++;
Sys_Printf( "Use %s as surface file\n", surfaceFilePath );
}
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 ] );
}
else{
Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] );
}
Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
return 0;
}
Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
return 0;
}
force_map = qfalse;
/* arg checking */
force_map = qfalse;
/* arg checking */
Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
return 0;
}
Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
return 0;
}
int ExportEntitiesMain( int argc, char **argv ){
/* arg checking */
int ExportEntitiesMain( int argc, char **argv ){
/* arg checking */
Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" );
return 0;
}
Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" );
return 0;
}
/* return to sender */
return 0;
/* return to sender */
return 0;
-}
\ No newline at end of file
int ExportLightmapsMain( int argc, char **argv ){
/* arg checking */
int ExportLightmapsMain( int argc, char **argv ){
/* arg checking */
Sys_Printf( "Usage: q3map -export [-v] <mapname>\n" );
return 0;
}
Sys_Printf( "Usage: q3map -export [-v] <mapname>\n" );
return 0;
}
Sys_Printf( "Usage: q3map -import [-v] <mapname>\n" );
return 0;
}
Sys_Printf( "Usage: q3map -import [-v] <mapname>\n" );
return 0;
}