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.138 by root, Sat Jul 28 16:48:45 2007 UTC vs.
Revision 1.144 by root, Fri Aug 3 02:20:32 2007 UTC

… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (music => sub { 53 $self->connect_ext (ambient_music => sub {
54 my ($ev) = @_; 54 my ($songs) = @_;
55 55 &::audio_music_set_ambient ($songs);
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 }); 56 });
59 57
60 $self->connect_ext (capabilities => sub { 58 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_; 59 my (%cap) = @_;
62 60
63 #$self->send ("setup sound 0"); # we use a different protocol 61 #$self->send ("setup sound 0"); # we use a different protocol
64 62
65 $self->send_exti_msg (fx_want => { 63 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 #5 => !!$::CFG->{audio_enable}, # FT_SOUND 65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 }); 66 });
69 67
70 if (my $ts = $cap{tileset}) { 68 if (my $ts = $cap{tileset}) {
71 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
72 $self->{tileset} = $default; 70 $self->{tileset} = $default;
… …
735 733
736 CFPlus::DB::get tilecache => $id, $cb; 734 CFPlus::DB::get tilecache => $id, $cb;
737 735
738 } elsif ($face->{type} & 1) { # with metadata 736 } elsif ($face->{type} & 1) { # with metadata
739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
740 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 738 CFPlus::DB::get res_meta => $face->{name}, $cb;
741 } 739 }
742} 740}
743 741
744sub face_update { 742sub face_update {
745 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
… …
758 $self->{music_meta}{$facenum} = $face; 756 $self->{music_meta}{$facenum} = $face;
759 757
760 ::message ({ markup => "downloaded song #$facenum" }) 758 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed; 759 if $changed;
762 760
763 &::audio_music_set ($self->{songs}); 761 &::audio_music_push ($facenum);
764 }; 762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
765 } 771 };
766 772 }
767 my $path = CFPlus::DB::path_of_res $face->{name};
768 773
769 if ($changed) { # new data 774 if ($changed) { # new data
770 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
771 776
772 CFPlus::DB::write_file $path, $data, sub { 777 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
773 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
774 $face->{meta} = $self->{json_coder}->decode ($meta_json); 779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
775 $face->{path} = $path; 780 ::add_license ($face);
776
777 $cb->(); 781 $cb->();
778 };
779 }; 782 };
783
780 } else { 784 } else {
781 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
782 $face->{path} = $path; 786 ::add_license ($face);
783 $cb->(); 787 $cb->();
784 } 788 }
785 } 789 }
786} 790}
787 791
… …
817 @{$self->{face_cb}{$id}}; 821 @{$self->{face_cb}{$id}};
818 } 822 }
819} 823}
820 824
821sub sound_play { 825sub sound_play {
822 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
823 warn "sound play <@_>\n";#d#
824 827
825 #$self->{sound_play}->($x, $y, $soundnum, $type); 828 &::audio_sound_play ($face, $dx, $dy, $vol)
829 unless $type & 1; # odd types are silent for future expansion
826} 830}
827 831
828my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
829 833
830sub query { 834sub query {
… …
968 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
969 973
970 ::stop_game (); 974 ::stop_game ();
971} 975}
972 976
973sub image_info {
974 my ($self, $numfaces) = @_;
975
976 $self->{num_faces} = $numfaces;
977 $self->{face_prefetch} = [1 .. $numfaces];
978 $self->face_prefetch;
979}
980
981sub face_prefetch {
982 my ($self) = @_;
983
984 return unless $::CFG->{face_prefetch};
985
986 if ($self->{num_faces}) {
987 return if @{ $self->{send_queue} || [] };
988 my $todo = @{ $self->{face_prefetch} }
989 or return;
990
991 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
992
993 $self->send ("requestinfo image_sums $face $face");
994
995 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
996 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
997 } elsif (!exists $self->{num_faces}) {
998 $self->send ("requestinfo image_info");
999
1000 $self->{num_faces} = 0;
1001
1002 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
1003 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
1004 }
1005}
1006
1007sub update_floorbox { 977sub update_floorbox {
1008 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1009 return unless $::CONN; 979 return unless $::CONN;
1010 980
1011 $::FLOORBOX->clear; 981 $::FLOORBOX->clear;

Diff Legend

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