save the options my build machine actually uses

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

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 3820aff435f1bb68db8bd3a2886f0c8613251e8c..30000674b4c29d0523b8f514af6a7bd11fb757a1 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -25,7 +25,7 @@ use File::Temp;
        our $VISFLAGS    = '';
 
        # Default flags for the -light stage
-       our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512 -bounce 8 -fastbounce -bouncegrid';
+       our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512';
 
        # Default flags for the -minimap stage
        our $MINIMAPFLAGS = '';
@@ -180,7 +180,7 @@ for my $m(@{$options->{maps}})
        {
                my $previous_shaderlist = undef;
                my $shaderlist = "";
-               if(open my $fh, "<", "$XONOTICDIR/data/xonotic-maps.pk3dir/scripts/shaderlist.txt")
+               if(open my $fh, "<", "$XONOTICDIR/data/scripts/shaderlist.txt")
                {
                        while(<$fh>)
                        {
@@ -232,6 +232,14 @@ for my $m(@{$options->{maps}})
                                }
                        }
                };
+
+               if(defined $shaderlist_new)
+               {
+                       mkdir "$mapdir/scripts";
+                       open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
+                       print $fh $shaderlist_new;
+                       close $fh;
+               }
        }
 
        local $SIG{INT} = sub
@@ -243,14 +251,6 @@ for my $m(@{$options->{maps}})
 
        eval
        {
-               if(defined $shaderlist_new)
-               {
-                       mkdir "$mapdir/scripts";
-                       open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
-                       print $fh $shaderlist_new;
-                       close $fh;
-               }
-
                unlink <$m/lm_*>; # delete old external lightmaps
                q3map2 '-bsp', @{$options->{bsp}},   "$m.map"
                        or die "-bsp: $?";