… | |
… | |
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; |
… | |
… | |
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; |
755 | |
756 | |
756 | if ($face->{type} == 3) { # FT_MUSIC |
757 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
758 | # store externally |
|
|
759 | $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
760 | |
757 | $cb = sub { |
761 | $cb = sub { |
758 | $self->{music_meta}{$facenum} = $face; |
762 | $self->{music_meta}{$facenum} = $face; |
759 | |
763 | |
760 | ::message ({ markup => "downloaded song #$facenum" }) |
764 | ::message ({ markup => "downloaded song #$facenum" }) |
761 | if $changed; |
765 | if $changed; |
762 | |
766 | |
763 | &::audio_music_set ($self->{songs}); |
767 | &::audio_music_set ($self->{songs}); |
764 | }; |
768 | }; |
|
|
769 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
770 | $cb = sub { |
|
|
771 | $self->{sound_meta}{$facenum} = $face; |
|
|
772 | |
|
|
773 | use Data::Dumper; warn Dumper $face;#d# |
|
|
774 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
775 | if $changed; |
765 | } |
776 | }; |
|
|
777 | } |
766 | |
778 | |
767 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
768 | |
779 | |
769 | if ($changed) { # new data |
780 | if ($changed) { # new data |
770 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
781 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
771 | |
782 | |
772 | CFPlus::DB::write_file $path, $data, sub { |
783 | my $put_cb = sub { |
773 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
784 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
774 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
785 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
775 | $face->{path} = $path; |
786 | $face->{path} = $path; |
776 | |
787 | |
777 | $cb->(); |
788 | $cb->(); |
778 | }; |
789 | }; |
779 | }; |
790 | }; |
|
|
791 | |
|
|
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 | } |
780 | } else { |
797 | } else { |
781 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
798 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
782 | $face->{path} = $path; |
799 | $face->{path} = $path; |
783 | $cb->(); |
800 | $cb->(); |
784 | } |
801 | } |
… | |
… | |
968 | $self->{map_widget}->clr_commands; |
985 | $self->{map_widget}->clr_commands; |
969 | |
986 | |
970 | ::stop_game (); |
987 | ::stop_game (); |
971 | } |
988 | } |
972 | |
989 | |
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 { |
990 | sub update_floorbox { |
1008 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
991 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1009 | return unless $::CONN; |
992 | return unless $::CONN; |
1010 | |
993 | |
1011 | $::FLOORBOX->clear; |
994 | $::FLOORBOX->clear; |