X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler;h=92b7c5ce01fe79875725068a895e6725bcf3c9bf;hb=d18650a33685341eaba7d5aa4ede7c22e4e47277;hp=c80e0a92640c08b72682a66ef76638ef1e546ba5;hpb=c6d5d85b2447f72f22b2b805688c240cc8a3b6c9;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index c80e0a92..92b7c5ce 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -55,7 +55,7 @@ my $options =
 	scale => [], # can't have defaults atm
 	order => [split /\s*,\s*/, $ORDER],
 	maps => [],
-	scale => 1,
+	scalefactor => 1,
 	bsp_timeout => 0,
 	vis_timeout => 0,
 	light_timeout => 0,
@@ -91,7 +91,7 @@ while(@ARGV)
 	}
 	elsif($_ eq '-scale')
 	{
-		$options->{scale} = (shift @ARGV) || 1;
+		$options->{scalefactor} = @ARGV ? shift(@ARGV) : 1;
 		$enterflags = 'scale';
 	}
 	elsif($_ eq '-novis')
@@ -128,7 +128,7 @@ while(@ARGV)
 	}
 	elsif($_ eq '-scale_timeout')
 	{
-		$options->{minimap_timeout} = shift @ARGV;
+		$options->{scale_timeout} = shift @ARGV;
 	}
 	elsif($_ eq '-order')
 	{
@@ -214,26 +214,17 @@ sub q3map2(@)
 $mapdir = "/" if $mapdir eq "";
 symlink "$mapdir", "$linkdir/data";
 
-my ($prescale, $postscale) = ($options->{scale} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
+my ($prescale, $postscale) = ($options->{scalefactor} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
+$prescale = 1 if not defined $prescale;
 $postscale = 1 if not defined $postscale;
 
 for my $m(@{$options->{maps}})
 {
 	$m =~ s/\.(?:map|bsp)$//;
+
 	if($prescale != 1)
 	{
-		open my $checkfh, "<", "$m.map"
-			or die "open $m.map: $!";
-		my $keeplights = 0;
-		while(<$checkfh>)
-		{
-			/^\s*"_keeplights"\s+"1"\s*$/
-				or next;
-			$keeplights = 1;
-		}
-		close $checkfh;
-		die "$m does not define _keeplights to 1"
-			unless $keeplights;
+		unshift @{$options->{bsp}}, "-keeplights";
 	}
 
 	my %shaders = map { m!/([^/.]*)\.shader(?:$)! ? ($1 => 1) : () } glob "../scripts/*.shader";