diff --git a/docs/Complete_list_of_command_line_parameters.htm b/docs/Complete_list_of_command_line_parameters.htm index 90b6879a..80271f00 100644 --- a/docs/Complete_list_of_command_line_parameters.htm +++ b/docs/Complete_list_of_command_line_parameters.htm @@ -157,7 +157,6 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
  • -snap N: Snap brush bevel planes to the given number of units
  • -tempname filename.map: Read the MAP file from the given file name
  • -texrange N: Limit per-surface texture range to the given number of units, and subdivide surfaces like with q3map_tessSize if this is not met
  • -
  • -tmpout: Write the BSP file to /tmp
  • -verboseentities: Enable -v only for map entities, not for the world
  • @@ -174,8 +173,6 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
  • -nosort: Do not sort the portals before calculating vis (usually slower)
  • -passageOnly: Just use PassageFlow vis (usually less fps)
  • -saveprt: Keep the PRT file after running vis (so you can run vis again)
  • -
  • -tmpin: Use /tmp folder for input
  • -
  • -tmpout: Use /tmp folder for output
  • diff --git a/tools/quake3/q3map2/bsp.cpp b/tools/quake3/q3map2/bsp.cpp index d0e169d2..5f05e812 100644 --- a/tools/quake3/q3map2/bsp.cpp +++ b/tools/quake3/q3map2/bsp.cpp @@ -738,9 +738,6 @@ int BSPMain( int argc, char **argv ){ else if ( strEqual( argv[ i ], "-tempname" ) ) { strcpy( tempSource, argv[ ++i ] ); } - else if ( strEqual( argv[ i ], "-tmpout" ) ) { - strcpy( outbase, "/tmp" ); - } else if ( strEqual( argv[ i ], "-nowater" ) ) { Sys_Printf( "Disabling water\n" ); nowater = true; diff --git a/tools/quake3/q3map2/help.cpp b/tools/quake3/q3map2/help.cpp index 86884b34..ce8b7047 100644 --- a/tools/quake3/q3map2/help.cpp +++ b/tools/quake3/q3map2/help.cpp @@ -136,7 +136,6 @@ void HelpBsp() {"-sRGBtex", "Treat textures as sRGB colorspace"}, {"-tempname ", "Read the MAP file from the given file name"}, {"-texrange ", "Limit per-surface texture range to the given number of units, and subdivide surfaces like with `q3map_tessSize` if this is not met"}, - {"-tmpout", "Write the BSP file to /tmp"}, {"-verboseentities", "Enable `-v` only for map entities, not for the world"}, }; HelpOptions("BSP Stage", 0, 80, bsp, sizeof(bsp)/sizeof(struct HelpOption)); @@ -154,8 +153,6 @@ void HelpVis() {"-passageOnly", "Just use PassageFlow vis (usually less fps)"}, {"-prtfile ", "Portal file to read"}, {"-saveprt", "Keep the Portal file after running vis (so you can run vis again)"}, - {"-tmpin", "Use /tmp folder for input"}, - {"-tmpout", "Use /tmp folder for output"}, {"-v -v", "Extra verbose mode for cluster debug"}, // q3map2 common takes first -v }; HelpOptions("VIS Stage", 0, 80, vis, sizeof(vis)/sizeof(struct HelpOption)); diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index 8ca44272..f70fd2bb 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -2124,7 +2124,6 @@ Q_EXTERN char EnginePath[ 1024 ]; Q_EXTERN char name[ 1024 ]; Q_EXTERN char source[ 1024 ]; -Q_EXTERN char outbase[ 32 ]; Q_EXTERN int sampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_SAMPLE_SIZE ); /* lightmap sample size in units */ Q_EXTERN int minSampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_MIN_SAMPLE_SIZE ); /* minimum sample size to use at all */ @@ -2209,7 +2208,6 @@ Q_EXTERN bool mergevisportals; Q_EXTERN bool nosort; Q_EXTERN bool saveprt; Q_EXTERN bool hint; /* ydnar */ -Q_EXTERN char inbase[ MAX_QPATH ]; Q_EXTERN String64 globalCelShader; Q_EXTERN float farPlaneDist Q_ASSIGN( 0.0f ); /* rr2do2, rf, mre, ydnar all contributed to this one... */ diff --git a/tools/quake3/q3map2/vis.cpp b/tools/quake3/q3map2/vis.cpp index 5308a94b..5af319f3 100644 --- a/tools/quake3/q3map2/vis.cpp +++ b/tools/quake3/q3map2/vis.cpp @@ -1123,14 +1123,6 @@ int VisMain( int argc, char **argv ){ debugCluster = true; Sys_Printf( "Extra verbose mode enabled\n" ); } - else if ( strEqual( argv[i], "-tmpin" ) ) { - strcpy( inbase, "/tmp" ); - } - else if ( strEqual( argv[i], "-tmpout" ) ) { - strcpy( outbase, "/tmp" ); - } - - /* ydnar: -hint to merge all but hint portals */ else if ( strEqual( argv[ i ], "-hint" ) ) { Sys_Printf( "hint = true\n" ); @@ -1150,13 +1142,13 @@ int VisMain( int argc, char **argv ){ /* load the bsp */ - sprintf( source, "%s%s", inbase, ExpandArg( argv[ i ] ) ); + strcpy( source, ExpandArg( argv[ i ] ) ); path_set_extension( source, ".bsp" ); Sys_Printf( "Loading %s\n", source ); LoadBSPFile( source ); /* load the portal file */ - sprintf( portalfile, "%s%s", inbase, ExpandArg( argv[ i ] ) ); + strcpy( portalfile, ExpandArg( argv[ i ] ) ); path_set_extension( portalfile, ".prt" ); Sys_Printf( "Loading %s\n", portalfile ); LoadPortals( portalfile );