[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.344 by root, Mon Aug 27 02:43:38 2007 UTC

 use Coro::Semaphore;
 use Coro::AIO;
 use Coro::Storable;
 use Coro::Util ();
-use JSON::XS 1.4 ();
+use JSON::XS ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
 use YAML::Syck ();
 =cut
 sub cf::client::ext_msg($$@) {
    my ($self, $type, @msg) = @_;
-   my $extcmd = $self->extcmd;
-   if ($extcmd == 2) {
+   if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
-   } elsif ($extcmd == 1) { # TODO: remove
+   } elsif ($self->extcmd == 1) { # TODO: remove
       push @msg, msgtype => "event_$type";
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
 }
 sub cf::client::ext_reply($$@) {
    my ($self, $id, @msg) = @_;
    if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->ns->extcmd == 1) {
+   } elsif ($self->extcmd == 1) {
       #TODO: version 1, remove
       unshift @msg, msgtype => "reply", msgid => $id;
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
 }
 # the server's init and main functions
 sub load_facedata($) {
    my ($path) = @_;
-   my $enc = JSON::XS->new->utf8->canonical;
+   my $enc = JSON::XS->new->utf8->canonical->relaxed;
    warn "loading facedata from $path\n";
    my $facedata;
    0 < aio_load $path, $facedata

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines