ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.136 by elmex, Fri Jul 27 18:04:42 2007 UTC vs.
Revision 1.139 by root, Sun Jul 29 18:22:34 2007 UTC

… …
57 if $ev->{play}; 57 if $ev->{play};
58 }); 58 });
59 59
60 $self->connect_ext (capabilities => sub { 60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_; 61 my (%cap) = @_;
62
63 #$self->send ("setup sound 0"); # we use a different protocol
62 64
63 $self->send_exti_msg (fx_want => { 65 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND 67 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 }); 68 });
… …
748 750
749 $self->set_texture ($face->{id} => delete $face->{data}); 751 $self->set_texture ($face->{id} => delete $face->{data});
750 752
751 } elsif ($face->{type} & 1) { # split metadata 753 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { }; 754 my $cb = sub { };
755 my $path;
753 756
754 if ($face->{type} == 3) { # FT_MUSIC 757 if ($face->{type} == 3) { # FT_MUSIC
758 # store externally
759 $path = CFPlus::DB::path_of_res $face->{name};
760
755 $cb = sub { 761 $cb = sub {
756 $self->{music_meta}{$facenum} = $face; 762 $self->{music_meta}{$facenum} = $face;
757 763
758 ::message ({ markup => "downloaded song #$facenum" }) 764 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed; 765 if $changed;
760 766
761 &::audio_music_set ($self->{songs}); 767 &::audio_music_set ($self->{songs});
762 }; 768 };
769 } elsif ($face->{type} == 5) { # FT_SOUND
770 $cb = sub {
771 $self->{sound_meta}{$facenum} = $face;
772
773 use Data::Dumper; warn Dumper $face;#d#
774 ::message ({ markup => "downloaded sound #$facenum" })
775 if $changed;
763 } 776 };
777 }
778
764 779
765 if ($changed) { # new data 780 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 781 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768 782
769 CFPlus::DB::write_file $path, $data, sub { 783 my $put_cb = sub {
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 784 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json); 785 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path; 786 $face->{path} = $path;
773 787
774 $cb->(); 788 $cb->();
775 }; 789 };
776 }; 790 };
791
792 if (defined $path) {
793 CFPlus::DB::write_file $path, $data, $put_cb;
794 } else {
795 CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb;
796 }
777 } else { 797 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 798 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
799 $face->{path} = $path;
779 $cb->(); 800 $cb->();
780 } 801 }
781 } 802 }
782} 803}
783 804
… …
814 } 835 }
815} 836}
816 837
817sub sound_play { 838sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 839 my ($self, $x, $y, $soundnum, $type) = @_;
840 warn "sound play <@_>\n";#d#
819 841
820 $self->{sound_play}->($x, $y, $soundnum, $type); 842 #$self->{sound_play}->($x, $y, $soundnum, $type);
821} 843}
822 844
823my $LAST_QUERY; # server is stupid, stupid, stupid 845my $LAST_QUERY; # server is stupid, stupid, stupid
824 846
825sub query { 847sub query {
… …
890 $self->{$type} = $text; 912 $self->{$type} = $text;
891 } else { 913 } else {
892 $self->logprint ("msg: ", $text); 914 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 915 return if $color < 0; # negative color == ignore if not understood
894 916
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 917 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
896 918
897 ## try to create single paragraphs of multiple lines sent by the server 919 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers 920 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 921 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 922
… …
961 my ($self) = @_; 983 my ($self) = @_;
962 984
963 $self->{map_widget}->clr_commands; 985 $self->{map_widget}->clr_commands;
964 986
965 ::stop_game (); 987 ::stop_game ();
966}
967
968sub image_info {
969 my ($self, $numfaces) = @_;
970
971 $self->{num_faces} = $numfaces;
972 $self->{face_prefetch} = [1 .. $numfaces];
973 $self->face_prefetch;
974}
975
976sub face_prefetch {
977 my ($self) = @_;
978
979 return unless $::CFG->{face_prefetch};
980
981 if ($self->{num_faces}) {
982 return if @{ $self->{send_queue} || [] };
983 my $todo = @{ $self->{face_prefetch} }
984 or return;
985
986 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
987
988 $self->send ("requestinfo image_sums $face $face");
989
990 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 } elsif (!exists $self->{num_faces}) {
993 $self->send ("requestinfo image_info");
994
995 $self->{num_faces} = 0;
996
997 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
998 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
999 }
1000} 988}
1001 989
1002sub update_floorbox { 990sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 991 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 992 return unless $::CONN;

Diff Legend

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