I really wonder why scale ever worked... ;)

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index c80e0a92640c08b72682a66ef76638ef1e546ba5..5d3f8bca6343f5ef42d52ae9aaccfc0a37cffcb8 100755 (executable)
--- 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;
        elsif($_ eq '-scale')
        {
                $options->{scale} = (shift @ARGV) || 1;

-               $enterflags = 'scale';
+               #$enterflags = 'scale';

        }
        elsif($_ eq '-novis')
        {
        }
        elsif($_ eq '-novis')
        {


@@ -215,25 +215,16 @@ $mapdir = "/" if $mapdir eq "";
 symlink "$mapdir", "$linkdir/data";
 
 my ($prescale, $postscale) = ($options->{scale} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
 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)$//;
 $postscale = 1 if not defined $postscale;
 
 for my $m(@{$options->{maps}})
 {
        $m =~ s/\.(?:map|bsp)$//;

+

        if($prescale != 1)
        {
        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";
        }
 
        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)
                {
                        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: $!";
                                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)
                {
 
                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: $!";
                                or die "-scale: $?";
                        rename "${m}_s.bsp", "$m.bsp"
                                or die "rename ${m}_s.bsp $m.bsp: $!";