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

change -convert arguments to get -readmap, -readbsp arguments

Browse Source
This commit is contained in:
Rudolf Polzer
2010-12-28 13:47:29 +01:00
parent 1ba2ff7e29
commit 74ca0f3701
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1537,14 +1537,15 @@ int ConvertBSPMain( int argc, char **argv )
int (*convertFunc)( char * );
game_t *convertGame;
char ext[1024];
qboolean map_allowed, force_bsp;
qboolean map_allowed, force_bsp, force_map;
/* set default */
convertFunc = ConvertBSPToASE;
convertGame = NULL;
map_allowed = qtrue;
map_allowed = qfalse;
force_bsp = qfalse;
force_map = qfalse;
/* arg checking */
if( argc < 1 )
@@ -1609,8 +1610,10 @@ int ConvertBSPMain( int argc, char **argv )
lightmapsAsTexcoord = qtrue;
deluxemap = qtrue;
}
else if( !strcmp( argv[ i ], "-forcereadbsp" ) )
else if( !strcmp( argv[ i ], "-readbsp" ) )
force_bsp = qtrue;
else if( !strcmp( argv[ i ], "-readmap" ) )
force_map = qtrue;
else if( !strcmp( argv[ i ], "-meta" ) )
meta = qtrue;
else if( !strcmp( argv[ i ], "-patchmeta" ) )
@@ -1625,7 +1628,11 @@ int ConvertBSPMain( int argc, char **argv )
/* clean up map name */
strcpy(source, ExpandArg(argv[i]));
ExtractFileExtension(source, ext);
if(!Q_stricmp(ext, "map") && !force_bsp)
if(!map_allowed && !force_map)
force_bsp = qtrue;
if(force_map || (!force_bsp && !Q_stricmp(ext, "map") && map_allowed))
{
if(!map_allowed)
Sys_Printf("WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n");