RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-08 06:27:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

map compiler: -minimap: work better with mapinfo bounds and -scale

Browse Source
This commit is contained in:
Rudolf Polzer 2010-11-03 21:33:40 +01:00
parent fd77a4af9c
commit c6d5d85b24
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
misc/tools/xonotic-map-compiler
View File

@ -31,7 +31,7 @@ use File::Temp;
our $MINIMAPFLAGS = ''; our $MINIMAPFLAGS = '';
# Default order of commands # Default order of commands
our $ORDER = 'light,vis,minimap'; our $ORDER = 'vis,light';
# end of user changable part # end of user changable part
@ -325,7 +325,7 @@ for my $m(@{$options->{maps}})
or die "rename ${m}_s.bsp $m.bsp: $!"; or die "rename ${m}_s.bsp $m.bsp: $!";
} }
my @o = @{$options->{order}}; my @o = @{$options->{order}};
push @o, qw/light vis minimap/; push @o, qw/light vis/;
my %o = (); my %o = ();
for(@o) for(@o)
@ -347,14 +347,6 @@ for my $m(@{$options->{maps}})
or die "-vis: $?"; or die "-vis: $?";
} }
} }
if($_ eq 'minimap')
{
if(defined $options->{minimap})
{
q3map2 '-minimap', @{$options->{minimap}}, "$m.map"
or die "-minimap: $?";
}
}
} }
if($postscale != 1) if($postscale != 1)
@ -365,6 +357,12 @@ for my $m(@{$options->{maps}})
or die "rename ${m}_s.bsp $m.bsp: $!"; 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.srf";
unlink "$m.prt"; unlink "$m.prt";