--- deliantra/server/utils/cfutil.in 2007/07/26 21:44:43 1.47 +++ deliantra/server/utils/cfutil.in 2007/07/31 02:24:43 1.48 @@ -415,16 +415,16 @@ my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; - $file =~ s/\.res$//; - $file =~ s/\.(ogg|wav|jpg|png)$//; - - substr $dir, 0, 1 + length $PATH, ""; - $meta = { %{ $meta->{"" } || {} }, %{ $meta->{$file} || {} }, }; + $file =~ s/\.res$//; + $file =~ s/\.(ogg|wav|jpg|png)$//; + + substr $dir, 0, 1 + length $PATH, ""; + $RESOURCE{"$dir/$file"} = { type => (delete $meta->{type}) || $type, data => $data,