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

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index c80e0a92..5d3f8bca 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -92,7 +92,7 @@ while(@ARGV)
 	elsif($_ eq '-scale')
 	{
 		$options->{scale} = (shift @ARGV) || 1;
-		$enterflags = 'scale';
+		#$enterflags = 'scale';
 	}
 	elsif($_ eq '-novis')
 	{
@@ -215,25 +215,16 @@ $mapdir = "/" if $mapdir eq "";
 symlink "$mapdir", "$linkdir/data";
 
 my ($prescale, $postscale) = ($options->{scale} =~ /^([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";
@@ -319,7 +310,7 @@ for my $m(@{$options->{maps}})
 			or die "-bsp: $?";
 		if($prescale != 1)
 		{
-			q3map2 '-scale', @{$options->{scale}}, $prescale, "$m.bsp"
+			q3map2 '-scale', $prescale, "$m.bsp"
 				or die "-scale: $?";
 			rename "${m}_s.bsp", "$m.bsp"
 				or die "rename ${m}_s.bsp $m.bsp: $!";
@@ -351,7 +342,7 @@ for my $m(@{$options->{maps}})
 
 		if($postscale != 1)
 		{
-			q3map2 '-scale', @{$options->{scale}}, $postscale, "$m.bsp"
+			q3map2 '-scale', $postscale, "$m.bsp"
 				or die "-scale: $?";
 			rename "${m}_s.bsp", "$m.bsp"
 				or die "rename ${m}_s.bsp $m.bsp: $!";