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.334 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.338 by root, Tue Aug 21 01:07:47 2007 UTC

… …
1149 my ($type, $reply, @payload) = 1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1150 "ARRAY" eq ref $msg
1151 ? @$msg 1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1153
1154 my @reply;
1155
1154 if (my $cb = $EXTCMD{$type}) { 1156 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1157 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1160 } else { 1163 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1165 }
1163 1166
1164 cf::override; 1167 cf::override;
… …
1505=cut 1508=cut
1506 1509
1507sub ext_reply($$@) { 1510sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1511 my ($self, $id, @msg) = @_;
1509 1512
1510 if ($self->ns->extcmd == 2) { 1513 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1514}
1518 1515
1519=item $player->ext_msg ($type, @msg) 1516=item $player->ext_msg ($type, @msg)
1520 1517
1521Sends an ext event to the client. 1518Sends an ext event to the client.
… …
2567 push @msg, msgtype => "event_$type"; 2564 push @msg, msgtype => "event_$type";
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2566 }
2570} 2567}
2571 2568
2569=item $client->ext_reply ($msgid, @msg)
2570
2571Sends an ext reply to the client.
2572
2573=cut
2574
2575sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_;
2577
2578 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) {
2581 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 }
2585}
2586
2572=item $success = $client->query ($flags, "text", \&cb) 2587=item $success = $client->query ($flags, "text", \&cb)
2573 2588
2574Queues a query to the client, calling the given callback with 2589Queues a query to the client, calling the given callback with
2575the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2590the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2576C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2591C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
… …
2634 my ($type, $reply, @payload) = 2649 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 2650 "ARRAY" eq ref $msg
2636 ? @$msg 2651 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2652 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 2653
2654 my @reply;
2655
2639 if (my $cb = $EXTICMD{$type}) { 2656 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 2657 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 2658 }
2659
2660 $ns->ext_reply ($reply, @reply)
2661 if $reply;
2662
2645 } else { 2663 } else {
2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2664 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2647 } 2665 }
2648 2666
2649 cf::override; 2667 cf::override;
… …
2825 2843
2826 $facedata->{version} == 2 2844 $facedata->{version} == 2
2827 or cf::cleanup "$path: version mismatch, cannot proceed."; 2845 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828 2846
2829 # patch in the exptable 2847 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = { 2848 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC, 2849 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2850 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2834 }; 2851 };
2835 cf::cede_to_tick; 2852 cf::cede_to_tick;
2836 2853
2837 { 2854 {
2838 my $faces = $facedata->{faceinfo}; 2855 my $faces = $facedata->{faceinfo};
… …
2891 name => $name, 2908 name => $name,
2892 %{ $info->{meta} || {} }, 2909 %{ $info->{meta} || {} },
2893 }); 2910 });
2894 2911
2895 $data = pack "(w/a*)*", $meta, $info->{data}; 2912 $data = pack "(w/a*)*", $meta, $info->{data};
2913 } else {
2914 $data = $info->{data};
2896 } 2915 }
2897 2916
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type}; 2918 cf::face::set_type $idx, $info->{type};
2900 2919

Diff Legend

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