--- deliantra/Deliantra-Client/DC.pm 2007/05/09 11:46:49 1.144 +++ deliantra/Deliantra-Client/DC.pm 2007/12/05 11:06:51 1.160 @@ -17,7 +17,7 @@ use Carp (); BEGIN { - $VERSION = '0.98'; + $VERSION = '0.9957'; use XSLoader; XSLoader::load "CFPlus", $VERSION; @@ -30,12 +30,7 @@ use File::Path (); use Storable (); # finally use Fcntl (); - -BEGIN { - use Crossfire::Protocol::Base (); - *to_json = \&Crossfire::Protocol::Base::to_json; - *from_json = \&Crossfire::Protocol::Base::from_json; -} +use JSON::XS qw(encode_json decode_json); =item guard { BLOCK } @@ -172,7 +167,7 @@ utf8::decode $CFG; $::CFG = YAML::Load ($CFG); } elsif ($CFG =~ /^\{/) { - $::CFG = from_json $CFG; + $::CFG = decode_json $CFG; } else { $::CFG = eval $CFG; ## todo comaptibility cruft } @@ -185,7 +180,7 @@ open my $fh, ">:utf8", $file or return; - print $fh to_json $::CFG; + print $fh encode_json $::CFG; } sub http_proxy {