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

warn on wrong -convert use, always allow .map input

Browse Source
This commit is contained in:
Rudolf Polzer 2010-10-09 21:54:55 +02:00
parent cf1b60d899
commit 05b62ff70f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1550,7 +1550,7 @@ int ConvertBSPMain( int argc, char **argv )
if( !Q_stricmp( argv[ i ], "ase" ) ) if( !Q_stricmp( argv[ i ], "ase" ) )
{ {
convertFunc = ConvertBSPToASE; convertFunc = ConvertBSPToASE;
map_allowed = qtrue; map_allowed = qfalse;
} }
else if( !Q_stricmp( argv[ i ], "map_bp" ) ) else if( !Q_stricmp( argv[ i ], "map_bp" ) )
{ {
@ -1565,7 +1565,7 @@ int ConvertBSPMain( int argc, char **argv )
else else
{ {
convertGame = GetGame( argv[ i ] ); convertGame = GetGame( argv[ i ] );
map_allowed = qtrue; map_allowed = qfalse;
if( convertGame == NULL ) if( convertGame == NULL )
Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] ); Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
} }
@ -1591,8 +1591,10 @@ int ConvertBSPMain( int argc, char **argv )
/* clean up map name */ /* clean up map name */
strcpy(source, ExpandArg(argv[i])); strcpy(source, ExpandArg(argv[i]));
ExtractFileExtension(source, ext); ExtractFileExtension(source, ext);
if(!Q_stricmp(ext, "map") && map_allowed) if(!Q_stricmp(ext, "map"))
{ {
if(!map_allowed)
Sys_Printf("WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n");
StripExtension(source); StripExtension(source);
DefaultExtension(source, ".map"); DefaultExtension(source, ".map");
Sys_Printf("Loading %s\n", source); Sys_Printf("Loading %s\n", source);