Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

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

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 7a114e5223f045686a15a695e5fbdee2f064bbf6..427ee97103200293a248bcd4f57ebb6a6271a207 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';
+       our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512 -fast -fastbounce -dirty';
 
        # Default flags for the -minimap stage
        our $MINIMAPFLAGS = '';
@@ -134,6 +134,16 @@ while(@ARGV)
        {
                $options->{order} = [split /\s*,\s*/, shift @ARGV];
        }
+       elsif($_ =~ /^--no(-.*)/)
+       {
+               if($curmode eq 'maps')
+               {
+                       $curmode = 'bsp';
+               }
+               my $flag = $1;
+               @{$options->{$curmode}} = grep { (($_ eq $flag) ... /^-/) !~ /^[0-9]+$/ } @{$options->{$curmode}};
+                       # so, e.g. --no-samplesize removes "-samplesize" and a following "3"
+       }
        elsif($_ =~ /^-(-.*)/)
        {
                if($curmode eq 'maps')
@@ -183,7 +193,7 @@ sub q3map2(@)
                or die "fork: $!";
        if($pid) # parent
        {
-               local $SIG{ALRM} = sub { warn "SIGALRM caught\n"; kill $pid; };
+               local $SIG{ALRM} = sub { warn "SIGALRM caught\n"; kill TERM => $pid; };
                alarm $timeout
                        if $timeout;
                if(waitpid($pid, 0) != $pid)