minor fix for mergefail logic

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

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 92b7c5ce01fe79875725068a895e6725bcf3c9bf..6558a15ecfe1b35fd225f26831473275e9918a30 100755 (executable)
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -16,7 +16,7 @@ use File::Temp;
        our $Q3MAP2      = '/home/rpolzer/Games/Xonotic/netradiant/install/q3map2.x86';
 
        # General flags for q3map2 (for example -threads 4)
-       our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic-data.pk3 -fs_forbiddenpath xonotic-data.pk3dir -fs_forbiddenpath xonotic-nexcompat.pk3 -fs_forbiddenpath xonotic-nexcompat.pk3dir';
+       our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic*-data*.pk3* -fs_forbiddenpath xonotic*-nexcompat*.pk3*';
 
        # Default flags for the -bsp stage
        our $BSPFLAGS    = '-meta -maxarea -samplesize 8 -mv 1000000 -mi 6000000';
@@ -134,6 +134,18 @@ while(@ARGV)
        {
                $options->{order} = [split /\s*,\s*/, shift @ARGV];
        }
+       elsif($_ eq '-sRGB')
+       {
+               push @{$options->{bsp}}, "-sRGBtex", "-sRGBcolor";
+               push @{$options->{light}}, "-sRGBtex", "-sRGBcolor", "-sRGBlight"
+                       if defined $options->{light};
+       }
+       elsif($_ eq '-nosRGB')
+       {
+               push @{$options->{bsp}}, "-nosRGBtex", "-nosRGBcolor";
+               push @{$options->{light}}, "-nosRGBtex", "-nosRGBcolor", "-nosRGBlight"
+                       if defined $options->{light};
+       }
        elsif($_ =~ /^--no(-.*)/)
        {
                if($curmode eq 'maps')