--- deliantra/server/utils/cfutil.in 2007/08/21 19:44:57 1.58 +++ deliantra/server/utils/cfutil.in 2007/08/30 07:13:17 1.61 @@ -175,12 +175,11 @@ my $fi = $FACEINFO{$base}; unless ($fi) { - warn "$path: <$base> not referenced by any archetype, skipping.\n"; - next; + #warn "$path: <$base> not referenced by any archetype, skipping.\n"; + #next; } - my $arc = $FACEINFO{$base}{arc} - or die "FATAL: internal error <$base>, cannot continue"; + my $arc = $fi->{arc} || { }; unless ($path =~ /~$/) { # possibly enlarge @@ -497,9 +496,17 @@ my $data; aio_load "$dir/$file", $data; - my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; - next if $meta && !exists $meta->{$file}; + my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; + + utf8::decode $dir; + utf8::decode $file; + + # a meta file for resources is now mandatory + unless (exists $meta->{$file}) { + warn "skipping $dir/$file\n" if $VERBOSE >= 3; + next; + } $meta = { %{ $meta->{"" } || {} },