… | |
… | |
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 | |
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 | }; |
|
|
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); |
764 | }; |
773 | }; |
765 | } |
774 | } |
766 | |
775 | |
767 | if ($changed) { # new data |
776 | if ($changed) { # new data |
768 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
777 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
769 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
770 | |
778 | |
771 | CFPlus::DB::write_file $path, $data, sub { |
779 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
772 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
780 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
773 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
781 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
774 | $face->{path} = $path; |
|
|
775 | |
|
|
776 | $cb->(); |
782 | $cb->(); |
777 | }; |
|
|
778 | }; |
783 | }; |
|
|
784 | |
779 | } else { |
785 | } else { |
780 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
786 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
781 | $cb->(); |
787 | $cb->(); |
782 | } |
788 | } |
783 | } |
789 | } |
… | |
… | |
815 | @{$self->{face_cb}{$id}}; |
821 | @{$self->{face_cb}{$id}}; |
816 | } |
822 | } |
817 | } |
823 | } |
818 | |
824 | |
819 | sub sound_play { |
825 | sub sound_play { |
820 | my ($self, $x, $y, $soundnum, $type) = @_; |
826 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
821 | warn "sound play <@_>\n";#d# |
|
|
822 | |
827 | |
823 | #$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 |
824 | } |
830 | } |
825 | |
831 | |
826 | my $LAST_QUERY; # server is stupid, stupid, stupid |
832 | my $LAST_QUERY; # server is stupid, stupid, stupid |
827 | |
833 | |
828 | sub query { |
834 | sub query { |
… | |
… | |
893 | $self->{$type} = $text; |
899 | $self->{$type} = $text; |
894 | } else { |
900 | } else { |
895 | $self->logprint ("msg: ", $text); |
901 | $self->logprint ("msg: ", $text); |
896 | return if $color < 0; # negative color == ignore if not understood |
902 | return if $color < 0; # negative color == ignore if not understood |
897 | |
903 | |
898 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
904 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
899 | |
905 | |
900 | ## try to create single paragraphs of multiple lines sent by the server |
906 | ## try to create single paragraphs of multiple lines sent by the server |
901 | # no longer neecssary with TRT servers |
907 | # no longer neecssary with TRT servers |
902 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
908 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
903 | |
909 | |
… | |
… | |
964 | my ($self) = @_; |
970 | my ($self) = @_; |
965 | |
971 | |
966 | $self->{map_widget}->clr_commands; |
972 | $self->{map_widget}->clr_commands; |
967 | |
973 | |
968 | ::stop_game (); |
974 | ::stop_game (); |
969 | } |
|
|
970 | |
|
|
971 | sub image_info { |
|
|
972 | my ($self, $numfaces) = @_; |
|
|
973 | |
|
|
974 | $self->{num_faces} = $numfaces; |
|
|
975 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
976 | $self->face_prefetch; |
|
|
977 | } |
|
|
978 | |
|
|
979 | sub face_prefetch { |
|
|
980 | my ($self) = @_; |
|
|
981 | |
|
|
982 | return unless $::CFG->{face_prefetch}; |
|
|
983 | |
|
|
984 | if ($self->{num_faces}) { |
|
|
985 | return if @{ $self->{send_queue} || [] }; |
|
|
986 | my $todo = @{ $self->{face_prefetch} } |
|
|
987 | or return; |
|
|
988 | |
|
|
989 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
990 | |
|
|
991 | $self->send ("requestinfo image_sums $face $face"); |
|
|
992 | |
|
|
993 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
994 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
995 | } elsif (!exists $self->{num_faces}) { |
|
|
996 | $self->send ("requestinfo image_info"); |
|
|
997 | |
|
|
998 | $self->{num_faces} = 0; |
|
|
999 | |
|
|
1000 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
1001 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
1002 | } |
|
|
1003 | } |
975 | } |
1004 | |
976 | |
1005 | sub update_floorbox { |
977 | sub update_floorbox { |
1006 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
978 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1007 | return unless $::CONN; |
979 | return unless $::CONN; |