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.140 by root, Sun Jul 29 18:56:02 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
… …
758 $self->{music_meta}{$facenum} = $face; 758 $self->{music_meta}{$facenum} = $face;
759 759
760 ::message ({ markup => "downloaded song #$facenum" }) 760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed; 761 if $changed;
762 762
763 &::audio_music_set ($self->{songs}); 763 &::audio_music_set_ambient ($self->{songs});
764 }; 764 };
765 } elsif ($face->{type} == 5) { # FT_SOUND 765 } elsif ($face->{type} == 5) { # FT_SOUND
766 $cb = sub { 766 $cb = sub {
767 $self->{sound_meta}{$facenum} = $face; 767 $self->{sound_meta}{$facenum} = $face;
768 768
769 use Data::Dumper; warn Dumper $face;#d#
770 ::message ({ markup => "downloaded sound #$facenum" }) 769 ::message ({ markup => "downloaded sound #$facenum" })
771 if $changed; 770 if $changed;
771
772 &::audio_sound_push ($facenum);
772 }; 773 };
773 } 774 }
774
775 775
776 if ($changed) { # new data 776 if ($changed) { # new data
777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
778 778
779 CFPlus::DB::put res_data => $face->{name} => $data, sub { 779 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
781 $face->{meta} = $self->{json_coder}->decode ($meta_json); 781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
782
783 $cb->(); 782 $cb->();
784 };
785 }; 783 };
786 784
787 } else { 785 } else {
788 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
789 $cb->(); 787 $cb->();
… …
823 @{$self->{face_cb}{$id}}; 821 @{$self->{face_cb}{$id}};
824 } 822 }
825} 823}
826 824
827sub sound_play { 825sub sound_play {
828 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
829 warn "sound play <@_>\n";#d#
830 827
831 #$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
832} 830}
833 831
834my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
835 833
836sub query { 834sub query {

Diff Legend

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