| … | |
… | |
| 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 | |
| 63 | #$self->send ("setup sound 0"); # we use a different protocol |
63 | #$self->send ("setup sound 0"); # we use a different protocol |
| 64 | |
64 | |
| 65 | $self->send_exti_msg (fx_want => { |
65 | $self->send_exti_msg (fx_want => { |
| 66 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
66 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
| 67 | #5 => !!$::CFG->{audio_enable}, # FT_SOUND |
67 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
| 68 | }); |
68 | }); |
| 69 | |
69 | |
| 70 | if (my $ts = $cap{tileset}) { |
70 | if (my $ts = $cap{tileset}) { |
| 71 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
71 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
| 72 | $self->{tileset} = $default; |
72 | $self->{tileset} = $default; |
| … | |
… | |
| 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 | |
| 744 | sub face_update { |
744 | sub face_update { |
| 745 | my ($self, $facenum, $face, $changed) = @_; |
745 | my ($self, $facenum, $face, $changed) = @_; |
| … | |
… | |
| 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 |
|
|
766 | $cb = sub { |
|
|
767 | $self->{sound_meta}{$facenum} = $face; |
|
|
768 | |
|
|
769 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
770 | if $changed; |
|
|
771 | |
|
|
772 | &::audio_sound_push ($facenum); |
| 765 | } |
773 | }; |
| 766 | |
774 | } |
| 767 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
| 768 | |
775 | |
| 769 | if ($changed) { # new data |
776 | if ($changed) { # new data |
| 770 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
777 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
| 771 | |
778 | |
| 772 | CFPlus::DB::write_file $path, $data, sub { |
779 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
| 773 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
780 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
| 774 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
781 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
| 775 | $face->{path} = $path; |
|
|
| 776 | |
|
|
| 777 | $cb->(); |
782 | $cb->(); |
| 778 | }; |
|
|
| 779 | }; |
783 | }; |
|
|
784 | |
| 780 | } else { |
785 | } else { |
| 781 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
786 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
| 782 | $face->{path} = $path; |
|
|
| 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 | |
| 821 | sub sound_play { |
825 | sub 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 | |
| 828 | my $LAST_QUERY; # server is stupid, stupid, stupid |
832 | my $LAST_QUERY; # server is stupid, stupid, stupid |
| 829 | |
833 | |
| 830 | sub query { |
834 | sub 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 | |
| 973 | sub image_info { |
|
|
| 974 | my ($self, $numfaces) = @_; |
|
|
| 975 | |
|
|
| 976 | $self->{num_faces} = $numfaces; |
|
|
| 977 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
| 978 | $self->face_prefetch; |
|
|
| 979 | } |
|
|
| 980 | |
|
|
| 981 | sub 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 | |
|
|
| 1007 | sub update_floorbox { |
977 | sub 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; |
