map compiler: allow an option --no-fast that removes a -fast option (possibly includi...

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

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index bfc6593b5f8a665646a6ee9c0849b73c27f9efec..12be54ad7d0848cfcba200316255aa50073c0dd7 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -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,16 +193,15 @@ sub q3map2(@)
                or die "fork: $!";
        if($pid) # parent
        {
-               if($timeout)
-               {
-                       local $SIG{ALRM} = sub { kill $pid; };
-                       alarm $timeout;
-               }
-               if(waitpid $pid, 0 != $pid)
+               local $SIG{ALRM} = sub { warn "SIGALRM caught\n"; kill TERM => $pid; };
+               alarm $timeout
+                       if $timeout;
+               if(waitpid($pid, 0) != $pid)
                {
                        die "waitpid: did not return our child process $pid: $!";
                }
-               return !$?;
+               alarm 0;
+               return ($? == 0);
        }
        else # child
        {