| … | |
… | |
| 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 | } |
|
|
778 | |
| 766 | |
779 | |
| 767 | if ($changed) { # new data |
780 | if ($changed) { # new data |
| 768 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
781 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
| 769 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
| 770 | |
782 | |
| 771 | CFPlus::DB::write_file $path, $data, sub { |
783 | my $put_cb = sub { |
| 772 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
784 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
| 773 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
785 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
| 774 | $face->{path} = $path; |
786 | $face->{path} = $path; |
| 775 | |
787 | |
| 776 | $cb->(); |
788 | $cb->(); |
| 777 | }; |
789 | }; |
| 778 | }; |
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 | } |
| 779 | } else { |
797 | } else { |
| 780 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
798 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
799 | $face->{path} = $path; |
| 781 | $cb->(); |
800 | $cb->(); |
| 782 | } |
801 | } |
| 783 | } |
802 | } |
| 784 | } |
803 | } |
| 785 | |
804 | |
| … | |
… | |
| 893 | $self->{$type} = $text; |
912 | $self->{$type} = $text; |
| 894 | } else { |
913 | } else { |
| 895 | $self->logprint ("msg: ", $text); |
914 | $self->logprint ("msg: ", $text); |
| 896 | return if $color < 0; # negative color == ignore if not understood |
915 | return if $color < 0; # negative color == ignore if not understood |
| 897 | |
916 | |
| 898 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
917 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
| 899 | |
918 | |
| 900 | ## try to create single paragraphs of multiple lines sent by the server |
919 | ## try to create single paragraphs of multiple lines sent by the server |
| 901 | # no longer neecssary with TRT servers |
920 | # no longer neecssary with TRT servers |
| 902 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
921 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 903 | |
922 | |
| … | |
… | |
| 964 | my ($self) = @_; |
983 | my ($self) = @_; |
| 965 | |
984 | |
| 966 | $self->{map_widget}->clr_commands; |
985 | $self->{map_widget}->clr_commands; |
| 967 | |
986 | |
| 968 | ::stop_game (); |
987 | ::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 | } |
988 | } |
| 1004 | |
989 | |
| 1005 | sub update_floorbox { |
990 | sub update_floorbox { |
| 1006 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
991 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
| 1007 | return unless $::CONN; |
992 | return unless $::CONN; |
