--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/29 18:56:02 1.140 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/29 21:31:47 1.141 @@ -766,22 +766,20 @@ $cb = sub { $self->{sound_meta}{$facenum} = $face; - use Data::Dumper; warn Dumper $face;#d# ::message ({ markup => "downloaded sound #$facenum" }) if $changed; + + &::audio_sound_push ($facenum); }; } - if ($changed) { # new data my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; - CFPlus::DB::put res_data => $face->{name} => $data, sub { - CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { - $face->{meta} = $self->{json_coder}->decode ($meta_json); - - $cb->(); - }; + CFPlus::DB::put res_data => $face->{name} => $data, sub { }; + CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { + $face->{meta} = $self->{json_coder}->decode ($meta_json); + $cb->(); }; } else { @@ -825,10 +823,10 @@ } sub sound_play { - my ($self, $x, $y, $soundnum, $type) = @_; - warn "sound play <@_>\n";#d# + my ($self, $type, $face, $dx, $dy, $vol) = @_; - #$self->{sound_play}->($x, $y, $soundnum, $type); + &::audio_sound_play ($face, $dx, $dy, $vol) + unless $type & 1; # odd types are silent for future expansion } my $LAST_QUERY; # server is stupid, stupid, stupid