wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Adds UTF-8 BOM stripping to checkrefs.pl when using JSON files, patch by retrosnub. Refs #1556

Browse Source 
This was SVN commit r12456.
This commit is contained in:
historic_bruno 2012-08-17 19:24:23 +00:00
parent 37964d048e
commit fdb3995141
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/tools/entity/checkrefs.pl
View File

@ -372,7 +372,9 @@ sub add_civs
push @roots, $f;
open my $fh, vfs_to_physical($f) or die "Failed to open '$f': $!";
my $civ = decode_json(do { local $/; <$fh> });
# decode_json expects a UTF-8 string and doesn't handle BOMs, so we strip those
# (see http://trac.wildfiregames.com/ticket/1556)
my $civ = decode_json(do { local $/; my $file = <$fh>; $file =~ s/^\xEF\xBB\xBF//; $file });
push @deps, [ $f, "art/textures/ui/" . $civ->{Emblem} ];
@ -394,7 +396,9 @@ sub add_rms
push @roots, $f;
open my $fh, vfs_to_physical($f) or die "Failed to open '$f': $!";
my $rms = decode_json(do { local $/; <$fh> });
# decode_json expects a UTF-8 string and doesn't handle BOMs, so we strip those
# (see http://trac.wildfiregames.com/ticket/1556)
my $rms = decode_json(do { local $/; my $file = <$fh>; $file =~ s/^\xEF\xBB\xBF//; $file });
push @deps, [ $f, "maps/random/" . $rms->{settings}{Script} ];