--- deliantra/server/lib/cf.pm	2007/11/14 08:09:46	1.396
+++ deliantra/server/lib/cf.pm	2007/12/05 11:08:34	1.398
@@ -23,7 +23,7 @@
 use Coro::Storable;
 use Coro::Util ();
 
-use JSON::XS ();
+use JSON::XS 2.01 ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
@@ -248,11 +248,11 @@
    } || "[unable to dump $_[0]: '$@']";
 }
 
-=item $ref = cf::from_json $json
+=item $ref = cf::decode_json $json
 
 Converts a JSON string into the corresponding perl data structure.
 
-=item $json = cf::to_json $ref
+=item $json = cf::encode_json $ref
 
 Converts a perl data structure into its JSON representation.
 
@@ -260,8 +260,8 @@
 
 our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
 
-sub to_json   ($) { $json_coder->encode ($_[0]) }
-sub from_json ($) { $json_coder->decode ($_[0]) }
+sub encode_json($) { $json_coder->encode ($_[0]) }
+sub decode_json($) { $json_coder->decode ($_[0]) }
 
 =item cf::lock_wait $string
 
@@ -1057,7 +1057,7 @@
    on_instantiate => sub {
       my ($obj, $data) = @_;
 
-      $data = from_json $data;
+      $data = decode_json $data;
 
       for (@$data) {
          my ($name, $args) = @$_;
@@ -2640,7 +2640,7 @@
 
    $rmp->{random_seed} ||= $exit->random_seed;
 
-   my $data = cf::to_json $rmp;
+   my $data = cf::encode_json $rmp;
    my $md5 = Digest::MD5::md5_hex $data;
    my $meta = "$RANDOMDIR/$md5.meta";
 
@@ -3330,6 +3330,7 @@
    load_extensions;
 
    $TICK_WATCHER->start;
+   $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
    EV::loop;
 }