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.139 by root, Sun Jul 29 18:22:34 2007 UTC vs.
Revision 1.142 by root, Tue Jul 31 00:50:04 2007 UTC

… …
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (music => sub { 53 $self->connect_ext (music => sub {
54 my ($ev) = @_; 54 my ($ev) = @_;
55 55
56 &::audio_music_set ($self->{songs} = $ev->{play}) 56 &::audio_music_set_ambient ($self->{songs} = $ev->{ambient})
57 if $ev->{play}; 57 if $ev->{ambient};
58 }); 58 });
59 59
60 $self->connect_ext (capabilities => sub { 60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_; 61 my (%cap) = @_;
62 62
… …
735 735
736 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
737 737
738 } elsif ($face->{type} & 1) { # with metadata 738 } 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." }); 739 #::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; 740 CFPlus::DB::get res_meta => $face->{name}, $cb;
741 } 741 }
742} 742}
743 743
744sub face_update { 744sub face_update {
745 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
… …
750 750
751 $self->set_texture ($face->{id} => delete $face->{data}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752 752
753 } elsif ($face->{type} & 1) { # split metadata 753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { }; 754 my $cb = sub { };
755 my $path;
756 755
757 if ($face->{type} == 3) { # FT_MUSIC 756 if ($face->{type} == 3) { # FT_MUSIC
758 # store externally
759 $path = CFPlus::DB::path_of_res $face->{name};
760
761 $cb = sub { 757 $cb = sub {
762 $self->{music_meta}{$facenum} = $face; 758 $self->{music_meta}{$facenum} = $face;
763 759
764 ::message ({ markup => "downloaded song #$facenum" }) 760 ::message ({ markup => "downloaded song #$facenum" })
765 if $changed; 761 if $changed;
766 762
767 &::audio_music_set ($self->{songs}); 763 &::audio_music_set_ambient ($self->{songs});
768 }; 764 };
769 } elsif ($face->{type} == 5) { # FT_SOUND 765 } elsif ($face->{type} == 5) { # FT_SOUND
770 $cb = sub { 766 $cb = sub {
771 $self->{sound_meta}{$facenum} = $face; 767 $self->{sound_meta}{$facenum} = $face;
772 768
773 use Data::Dumper; warn Dumper $face;#d#
774 ::message ({ markup => "downloaded sound #$facenum" }) 769 ::message ({ markup => "downloaded sound #$facenum" })
775 if $changed; 770 if $changed;
771
772 &::audio_sound_push ($facenum);
776 }; 773 };
777 } 774 }
778
779 775
780 if ($changed) { # new data 776 if ($changed) { # new data
781 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
782 778
783 my $put_cb = sub { 779 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
784 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
785 $face->{meta} = $self->{json_coder}->decode ($meta_json); 781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
786 $face->{path} = $path;
787
788 $cb->(); 782 $cb->();
789 };
790 }; 783 };
791 784
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 }
797 } else { 785 } else {
798 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
799 $face->{path} = $path;
800 $cb->(); 787 $cb->();
801 } 788 }
802 } 789 }
803} 790}
804 791
… …
834 @{$self->{face_cb}{$id}}; 821 @{$self->{face_cb}{$id}};
835 } 822 }
836} 823}
837 824
838sub sound_play { 825sub sound_play {
839 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
840 warn "sound play <@_>\n";#d#
841 827
842 #$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
843} 830}
844 831
845my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
846 833
847sub query { 834sub query {

Diff Legend

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