X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler;h=e48194f3863c290d77fb29c6cd69f1e30d81c754;hp=596a511ca259f5d3774de7678cde8a10cc181b34;hb=3187b39433d7d91775732c67f590c1af28904078;hpb=ae02c9f56ecdfdb3dc7aa1064fbdfa84674dbf62

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 596a511c..e48194f3 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -16,7 +16,7 @@ use File::Temp;
 	our $Q3MAP2      = '/home/rpolzer/Games/Xonotic/netradiant/install/q3map2.x86';
 
 	# General flags for q3map2 (for example -threads 4)
-	our $Q3MAP2FLAGS = '';
+	our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic-data.pk3 -fs_forbiddenpath xonotic-data.pk3dir -fs_forbiddenpath xonotic-nexcompat.pk3 -fs_forbiddenpath xonotic-nexcompat.pk3dir';
 
 	# Default flags for the -bsp stage
 	our $BSPFLAGS    = '-meta -samplesize 8 -minsamplesize 4 -mv 1000000 -mi 6000000';
@@ -25,7 +25,7 @@ use File::Temp;
 	our $VISFLAGS    = '';
 
 	# Default flags for the -light stage
-	our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512';
+	our $LIGHTFLAGS  = '-lightmapsearchpower 3 -deluxe -patchshadows -samples 3 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid';
 
 	# Default flags for the -minimap stage
 	our $MINIMAPFLAGS = '';
@@ -134,6 +134,16 @@ while(@ARGV)
 	{
 		$options->{order} = [split /\s*,\s*/, shift @ARGV];
 	}
+	elsif($_ =~ /^--no(-.*)/)
+	{
+		if($curmode eq 'maps')
+		{
+			$curmode = 'bsp';
+		}
+		my $flag = $1;
+		@{$options->{$curmode}} = grep { (($_ eq $flag) ... /^-/) !~ /^[0-9]+$/ } @{$options->{$curmode}};
+			# so, e.g. --no-samplesize removes "-samplesize" and a following "3"
+	}
 	elsif($_ =~ /^-(-.*)/)
 	{
 		if($curmode eq 'maps')