From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 13 Nov 2010 07:03:39 +0000 (+0100)
Subject: option -forcereadbsp for -convert to allow forcing the BSP reading code in the radian... 
X-Git-Tag: xonotic-v0.5.0~155
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32f2674d1756be364b85622ce0030cf8923ec8e9;p=xonotic%2Fnetradiant.git

option -forcereadbsp for -convert to allow forcing the BSP reading code in the radiant build menu
---

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index acb060ac..efef64e9 100644
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -1525,13 +1525,14 @@ int ConvertBSPMain( int argc, char **argv )
 	int		(*convertFunc)( char * );
 	game_t	*convertGame;
 	char		ext[1024];
-	qboolean	map_allowed;
+	qboolean	map_allowed, force_bsp;
 	
 	
 	/* set default */
 	convertFunc = ConvertBSPToASE;
 	convertGame = NULL;
 	map_allowed = qtrue;
+	force_bsp = qfalse;
 	
 	/* arg checking */
 	if( argc < 1 )
@@ -1584,6 +1585,8 @@ int ConvertBSPMain( int argc, char **argv )
  		}
 		else if( !strcmp( argv[ i ],  "-shadersasbitmap" ) )
 			shadersAsBitmap = qtrue;
+		else if( !strcmp( argv[ i ],  "-forcereadbsp" ) )
+			force_bsp = qtrue;
 	}
 
 	LoadShaderInfo();
@@ -1591,7 +1594,7 @@ int ConvertBSPMain( int argc, char **argv )
 	/* clean up map name */
 	strcpy(source, ExpandArg(argv[i]));
 	ExtractFileExtension(source, ext);
-	if(!Q_stricmp(ext, "map"))
+	if(!Q_stricmp(ext, "map") && !force_bsp)
 	{
 		if(!map_allowed)
 			Sys_Printf("WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n");