From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 4 Nov 2010 06:22:39 +0000 (+0100)
Subject: no need to crash when no keepLights key... we can use the -keeplights option now
X-Git-Tag: xonotic-v0.1.0preview~88
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=aae67351ae7bde60f8e1d3dac21af45930151f43

no need to crash when no keepLights key... we can use the -keeplights option now
---

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index c80e0a92..c4f59a9a 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";