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.333 by root, Sun Aug 19 09:14:50 2007 UTC vs.
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC

… …
1505=cut 1505=cut
1506 1506
1507sub ext_reply($$@) { 1507sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1508 my ($self, $id, @msg) = @_;
1509 1509
1510 if ($self->ns->extcmd == 2) { 1510 $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} 1511}
1518 1512
1519=item $player->ext_msg ($type, @msg) 1513=item $player->ext_msg ($type, @msg)
1520 1514
1521Sends an ext event to the client. 1515Sends an ext event to the client.
… …
2567 push @msg, msgtype => "event_$type"; 2561 push @msg, msgtype => "event_$type";
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2563 }
2570} 2564}
2571 2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2582}
2583
2572=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2573 2585
2574Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2575the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2587the 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>. 2588C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
… …
2811# the server's init and main functions 2823# the server's init and main functions
2812 2824
2813sub load_facedata($) { 2825sub load_facedata($) {
2814 my ($path) = @_; 2826 my ($path) = @_;
2815 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2816 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2817 2831
2818 my $facedata; 2832 my $facedata;
2819 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2820 or die "$path: $!"; 2834 or die "$path: $!";
2821 2835
2822 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2823 2837
2824 $facedata->{version} == 2 2838 $facedata->{version} == 2
2825 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2826 2847
2827 { 2848 {
2828 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2829 2850
2830 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2831 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2832 cf::face::set_visibility $idx, $info->{visibility}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2833 cf::face::set_magicmap $idx, $info->{magicmap}; 2854 cf::face::set_magicmap $idx, $info->{magicmap};
2834 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2835 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2836 2857
2837 cf::cede_to_tick; 2858 cf::cede_to_tick;
2838 } 2859 }
2839 2860
2840 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
… …
2865 2886
2866 { 2887 {
2867 # TODO: for gcfclient pleasure, we should give resources 2888 # TODO: for gcfclient pleasure, we should give resources
2868 # that gcfclient doesn't grok a >10000 face index. 2889 # that gcfclient doesn't grok a >10000 face index.
2869 my $res = $facedata->{resource}; 2890 my $res = $facedata->{resource};
2870 my $enc = JSON::XS->new->utf8->canonical;
2871 2891
2872 my $soundconf = delete $res->{"res/sound.conf"}; 2892 my $soundconf = delete $res->{"res/sound.conf"};
2873 2893
2874 while (my ($name, $info) = each %$res) { 2894 while (my ($name, $info) = each %$res) {
2875 my $meta = $enc->encode ({
2876 name => $name,
2877 %{ $info->{meta} || {} },
2878 });
2879
2880 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2881 2897
2882 if ($info->{type} & 1) { 2898 if ($info->{type} & 1) {
2883 # prepend meta info 2899 # prepend meta info
2884 2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2885 my $data = pack "(w/a*)*", $meta, $info->{data}; 2906 $data = pack "(w/a*)*", $meta, $info->{data};
2886 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2887
2888 cf::face::set_data $idx, 0, $data, $chk;
2889 } else {
2890 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2891 } 2907 }
2892 2908
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2893 cf::face::set_type $idx, $info->{type}; 2910 cf::face::set_type $idx, $info->{type};
2894 2911
2895 cf::cede_to_tick; 2912 cf::cede_to_tick;
2896 } 2913 }
2897 2914

Diff Legend

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