… | |
… | |
57 | if $ev->{play}; |
57 | if $ev->{play}; |
58 | }); |
58 | }); |
59 | |
59 | |
60 | $self->connect_ext (capabilities => sub { |
60 | $self->connect_ext (capabilities => sub { |
61 | my (%cap) = @_; |
61 | my (%cap) = @_; |
|
|
62 | |
|
|
63 | #$self->send ("setup sound 0"); # we use a different protocol |
62 | |
64 | |
63 | $self->send_exti_msg (fx_want => { |
65 | $self->send_exti_msg (fx_want => { |
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
66 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
67 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
66 | }); |
68 | }); |
… | |
… | |
183 | |
185 | |
184 | my $w = $self->{widget}{$id} |
186 | my $w = $self->{widget}{$id} |
185 | or return; |
187 | or return; |
186 | |
188 | |
187 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
189 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
190 | }); |
|
|
191 | |
|
|
192 | # message window |
|
|
193 | $self->connect_ext (channel_info => sub { |
|
|
194 | my ($info) = @_; |
|
|
195 | $self->{channels}->{$info->{id}} = $info; |
|
|
196 | $::MESSAGE_WINDOW->add_channel ($info); |
188 | }); |
197 | }); |
189 | |
198 | |
190 | # destroy widgets on logout |
199 | # destroy widgets on logout |
191 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
200 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
192 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
201 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
… | |
… | |
726 | |
735 | |
727 | CFPlus::DB::get tilecache => $id, $cb; |
736 | CFPlus::DB::get tilecache => $id, $cb; |
728 | |
737 | |
729 | } elsif ($face->{type} & 1) { # with metadata |
738 | } elsif ($face->{type} & 1) { # with metadata |
730 | #::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." }); |
731 | CFPlus::DB::get "res-metadata" => $face->{name}, $cb; |
740 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
732 | } |
741 | } |
733 | } |
742 | } |
734 | |
743 | |
735 | sub face_update { |
744 | sub face_update { |
736 | my ($self, $facenum, $face, $changed) = @_; |
745 | my ($self, $facenum, $face, $changed) = @_; |
… | |
… | |
751 | ::message ({ markup => "downloaded song #$facenum" }) |
760 | ::message ({ markup => "downloaded song #$facenum" }) |
752 | if $changed; |
761 | if $changed; |
753 | |
762 | |
754 | &::audio_music_set ($self->{songs}); |
763 | &::audio_music_set ($self->{songs}); |
755 | }; |
764 | }; |
|
|
765 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
766 | $cb = sub { |
|
|
767 | $self->{sound_meta}{$facenum} = $face; |
|
|
768 | |
|
|
769 | use Data::Dumper; warn Dumper $face;#d# |
|
|
770 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
771 | if $changed; |
756 | } |
772 | }; |
|
|
773 | } |
|
|
774 | |
757 | |
775 | |
758 | if ($changed) { # new data |
776 | if ($changed) { # new data |
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
777 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
760 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
761 | |
778 | |
762 | CFPlus::DB::write_file $path, $data, sub { |
779 | CFPlus::DB::put res_data => $face->{name} => $data, sub { |
763 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
780 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
764 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
781 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
765 | $face->{path} = $path; |
|
|
766 | |
782 | |
767 | $cb->(); |
783 | $cb->(); |
768 | }; |
784 | }; |
769 | }; |
785 | }; |
|
|
786 | |
770 | } else { |
787 | } else { |
771 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
788 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
772 | $cb->(); |
789 | $cb->(); |
773 | } |
790 | } |
774 | } |
791 | } |
… | |
… | |
807 | } |
824 | } |
808 | } |
825 | } |
809 | |
826 | |
810 | sub sound_play { |
827 | sub sound_play { |
811 | my ($self, $x, $y, $soundnum, $type) = @_; |
828 | my ($self, $x, $y, $soundnum, $type) = @_; |
|
|
829 | warn "sound play <@_>\n";#d# |
812 | |
830 | |
813 | $self->{sound_play}->($x, $y, $soundnum, $type); |
831 | #$self->{sound_play}->($x, $y, $soundnum, $type); |
814 | } |
832 | } |
815 | |
833 | |
816 | my $LAST_QUERY; # server is stupid, stupid, stupid |
834 | my $LAST_QUERY; # server is stupid, stupid, stupid |
817 | |
835 | |
818 | sub query { |
836 | sub query { |
… | |
… | |
883 | $self->{$type} = $text; |
901 | $self->{$type} = $text; |
884 | } else { |
902 | } else { |
885 | $self->logprint ("msg: ", $text); |
903 | $self->logprint ("msg: ", $text); |
886 | return if $color < 0; # negative color == ignore if not understood |
904 | return if $color < 0; # negative color == ignore if not understood |
887 | |
905 | |
888 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
906 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
889 | |
907 | |
890 | ## try to create single paragraphs of multiple lines sent by the server |
908 | ## try to create single paragraphs of multiple lines sent by the server |
891 | # no longer neecssary with TRT servers |
909 | # no longer neecssary with TRT servers |
892 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
910 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
893 | |
911 | |
894 | ::message ({ fg => $fg, markup => $_ }) |
912 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
895 | for split /\n/, $text; |
913 | for split /\n/, $text; |
896 | |
914 | |
897 | $self->{statusbox}->add ($text, |
915 | $self->{statusbox}->add ($text, |
898 | group => $text, |
916 | group => $text, |
899 | fg => $fg, |
917 | fg => $fg, |
… | |
… | |
954 | my ($self) = @_; |
972 | my ($self) = @_; |
955 | |
973 | |
956 | $self->{map_widget}->clr_commands; |
974 | $self->{map_widget}->clr_commands; |
957 | |
975 | |
958 | ::stop_game (); |
976 | ::stop_game (); |
959 | } |
|
|
960 | |
|
|
961 | sub image_info { |
|
|
962 | my ($self, $numfaces) = @_; |
|
|
963 | |
|
|
964 | $self->{num_faces} = $numfaces; |
|
|
965 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
966 | $self->face_prefetch; |
|
|
967 | } |
|
|
968 | |
|
|
969 | sub face_prefetch { |
|
|
970 | my ($self) = @_; |
|
|
971 | |
|
|
972 | return unless $::CFG->{face_prefetch}; |
|
|
973 | |
|
|
974 | if ($self->{num_faces}) { |
|
|
975 | return if @{ $self->{send_queue} || [] }; |
|
|
976 | my $todo = @{ $self->{face_prefetch} } |
|
|
977 | or return; |
|
|
978 | |
|
|
979 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
980 | |
|
|
981 | $self->send ("requestinfo image_sums $face $face"); |
|
|
982 | |
|
|
983 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
984 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
985 | } elsif (!exists $self->{num_faces}) { |
|
|
986 | $self->send ("requestinfo image_info"); |
|
|
987 | |
|
|
988 | $self->{num_faces} = 0; |
|
|
989 | |
|
|
990 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
991 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
992 | } |
|
|
993 | } |
977 | } |
994 | |
978 | |
995 | sub update_floorbox { |
979 | sub update_floorbox { |
996 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
980 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
997 | return unless $::CONN; |
981 | return unless $::CONN; |
… | |
… | |
1155 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1139 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1156 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1140 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1157 | . "map size $self->{mapw}×$self->{maph}\n" |
1141 | . "map size $self->{mapw}×$self->{maph}\n" |
1158 | ); |
1142 | ); |
1159 | |
1143 | |
1160 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
1161 | } |
1144 | } |
1162 | |
1145 | |
1163 | sub logged_in { |
1146 | sub logged_in { |
1164 | my ($self) = @_; |
1147 | my ($self) = @_; |
1165 | |
1148 | |
… | |
… | |
1185 | |
1168 | |
1186 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1169 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1187 | $self->send_command ("output-count $::CFG->{output_count}"); |
1170 | $self->send_command ("output-count $::CFG->{output_count}"); |
1188 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1171 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1189 | $self->send_command ("pickup $::CFG->{pickup}"); |
1172 | $self->send_command ("pickup $::CFG->{pickup}"); |
1190 | } |
|
|
1191 | |
|
|
1192 | sub buildat { |
|
|
1193 | my ($self, $builditem, $x, $y) = @_; |
|
|
1194 | |
|
|
1195 | if ($self->{cfplus_ext}) { |
|
|
1196 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
1197 | } |
|
|
1198 | } |
1173 | } |
1199 | |
1174 | |
1200 | sub lookat { |
1175 | sub lookat { |
1201 | my ($self, $x, $y) = @_; |
1176 | my ($self, $x, $y) = @_; |
1202 | |
1177 | |