ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.341 by elmex, Sat Aug 25 16:51:38 2007 UTC vs.
Revision 1.343 by root, Mon Aug 27 01:13:48 2007 UTC

1948 1948
1949sub do_load_sync { 1949sub do_load_sync {
1950 my ($map) = @_; 1950 my ($map) = @_;
1951 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 1953 if $Coro::current == $Coro::main;
1954 1954
1955 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1956} 1956}
1957 1957
1958our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
2558=cut 2558=cut
2559 2559
2560sub cf::client::ext_msg($$@) { 2560sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2561 my ($self, $type, @msg) = @_;
2562 2562
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2563 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2565 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2566 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2568 }
2571} 2569}
2572 2570
2579sub cf::client::ext_reply($$@) { 2577sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2578 my ($self, $id, @msg) = @_;
2581 2579
2582 if ($self->extcmd == 2) { 2580 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2582 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2583 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2584 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2586 }
2589} 2587}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines