--- deliantra/server/utils/cfutil.in 2007/12/27 15:43:11 1.66 +++ deliantra/server/utils/cfutil.in 2008/01/14 10:12:13 1.68 @@ -16,7 +16,7 @@ use Getopt::Long; use Coro::Event; use AnyEvent; -use YAML::Syck (); +use YAML (); use JSON::XS (); use IO::AIO (); use File::Temp; @@ -535,7 +535,7 @@ if (my $filter = $meta->{cfutil_filter}) { if ($filter eq "yaml2json") { - $data = JSON::XS::encode_json YAML::Syck::Load $data; + $data = JSON::XS::encode_json YAML::Load $data; } elsif ($filter eq "json2json") { $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); } elsif ($filter eq "perl2json") { @@ -581,7 +581,7 @@ if ($file =~ /\.(jpg|png)$/) { $c_res->put ([$path, $file, 0]) # FT_FACE } elsif ($file =~ /\.(res)$/) { - $c_res->put ([$path, $file, 7]) # FT_RSRC + $c_res->put ([$path, $file, 6]) # FT_RSRC } else { $c_res->put ([$path, $file, undef]); }