--- deliantra/server/utils/cfutil.in 2007/12/17 08:50:15 1.64 +++ deliantra/server/utils/cfutil.in 2007/12/27 15:32:41 1.65 @@ -20,7 +20,7 @@ use JSON::XS (); use IO::AIO (); use File::Temp; -use Crossfire; +use Deliantra; use Coro; use Coro::AIO; use Coro::Util; @@ -536,6 +536,8 @@ if (my $filter = $meta->{cfutil_filter}) { if ($filter eq "yaml2json") { $data = JSON::XS::encode_json YAML::Syck::Load $data; + } elsif ($filter eq "json2json") { + $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); } else { warn "$dir/$file: unknown filter $filter, skipping\n"; } @@ -687,7 +689,7 @@ print "writing archetypes...\n" if $VERBOSE; open my $fh, ">:utf8", "$DATADIR/archetypes~" or die "$DATADIR/archetypes~: $!"; - print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; + print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; } {