--- deliantra/Deliantra-Client/DC.pm 2006/07/30 13:40:17 1.109 +++ deliantra/Deliantra-Client/DC.pm 2006/07/30 18:23:50 1.111 @@ -15,7 +15,7 @@ package CFPlus; BEGIN { - $VERSION = '0.1'; + $VERSION = '0.2'; use XSLoader; XSLoader::load "CFPlus", $VERSION; @@ -28,7 +28,6 @@ use BerkeleyDB; use Pod::POM (); use Scalar::Util (); -use JSON::Syck (); use Storable (); # finally our %STAT_TOOLTIP = ( @@ -107,14 +106,10 @@ die "FATAL: can't find required file $_[0]\n"; } -$JSON::Syck::ImplicitUnicode = 1; - -sub from_json { - JSON::Syck::Load $_[0] -} - -sub to_json { - JSON::Syck::Dump $_[0] +BEGIN { + use Crossfire::Protocol::Base (); + *to_json = \&Crossfire::Protocol::Base::to_json; + *from_json = \&Crossfire::Protocol::Base::from_json; } sub read_cfg {