From c6d5d85b2447f72f22b2b805688c240cc8a3b6c9 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 3 Nov 2010 21:33:40 +0100 Subject: [PATCH] map compiler: -minimap: work better with mapinfo bounds and -scale --- misc/tools/xonotic-map-compiler | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler index 73cb2197..c80e0a92 100755 --- a/misc/tools/xonotic-map-compiler +++ b/misc/tools/xonotic-map-compiler @@ -31,7 +31,7 @@ use File::Temp; our $MINIMAPFLAGS = ''; # Default order of commands - our $ORDER = 'light,vis,minimap'; + our $ORDER = 'vis,light'; # end of user changable part @@ -325,7 +325,7 @@ for my $m(@{$options->{maps}}) or die "rename ${m}_s.bsp $m.bsp: $!"; } my @o = @{$options->{order}}; - push @o, qw/light vis minimap/; + push @o, qw/light vis/; my %o = (); for(@o) @@ -347,14 +347,6 @@ for my $m(@{$options->{maps}}) or die "-vis: $?"; } } - if($_ eq 'minimap') - { - if(defined $options->{minimap}) - { - q3map2 '-minimap', @{$options->{minimap}}, "$m.map" - or die "-minimap: $?"; - } - } } if($postscale != 1) @@ -365,6 +357,12 @@ for my $m(@{$options->{maps}}) or die "rename ${m}_s.bsp $m.bsp: $!"; } + if(defined $options->{minimap}) + { + q3map2 '-minimap', @{$options->{minimap}}, "$m.map" + or die "-minimap: $?"; + } + unlink "$m.srf"; unlink "$m.prt"; -- 2.39.2