… | |
… | |
21 | |
21 | |
22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
23 | setup_req => { |
24 | extmap => 1, |
24 | extmap => 1, |
25 | excmd => 1, |
25 | excmd => 1, |
26 | ywidget => 1,#d# |
26 | xwidget => 1,#d# |
27 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
28 | }, |
28 | }, |
29 | ); |
29 | ); |
30 | |
30 | |
31 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
… | |
… | |
48 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
49 | @args |
49 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
51 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
52 | |
52 | |
53 | $self->connect_ext (music => sub { |
53 | $self->connect_ext (ambient_music => sub { |
54 | my ($ev) = @_; |
54 | my ($songs) = @_; |
55 | |
55 | &::audio_music_set_ambient ($songs); |
56 | &::audio_music_set ($self->{songs} = $ev->{play}) |
|
|
57 | if $ev->{play}; |
|
|
58 | }); |
56 | }); |
59 | |
57 | |
60 | $self->connect_ext (capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
61 | my (%cap) = @_; |
59 | my (%cap) = @_; |
|
|
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
62 | |
62 | |
63 | $self->send_exti_msg (fx_want => { |
63 | $self->send_exti_msg (fx_want => { |
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
66 | }); |
66 | }); |
… | |
… | |
226 | } |
226 | } |
227 | |
227 | |
228 | sub logprint { |
228 | sub logprint { |
229 | my ($self, @a) = @_; |
229 | my ($self, @a) = @_; |
230 | |
230 | |
231 | $self->{log_fh} ||= do { |
231 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
232 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
233 | |
|
|
234 | open my $fh, ">>:utf8", $path |
|
|
235 | or die "Couldn't open logfile $path: $!"; |
|
|
236 | |
|
|
237 | $fh->autoflush (1); |
|
|
238 | |
|
|
239 | $fh; |
|
|
240 | }; |
|
|
241 | |
|
|
242 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
243 | |
|
|
244 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
245 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
246 | |
|
|
247 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
248 | } |
232 | } |
249 | |
233 | |
250 | sub _stat_numdiff { |
234 | sub _stat_numdiff { |
251 | my ($self, $name, $old, $new) = @_; |
235 | my ($self, $name, $old, $new) = @_; |
252 | |
236 | |
… | |
… | |
733 | |
717 | |
734 | CFPlus::DB::get tilecache => $id, $cb; |
718 | CFPlus::DB::get tilecache => $id, $cb; |
735 | |
719 | |
736 | } elsif ($face->{type} & 1) { # with metadata |
720 | } elsif ($face->{type} & 1) { # with metadata |
737 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
721 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
738 | CFPlus::DB::get "res-metadata" => $face->{name}, $cb; |
722 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
739 | } |
723 | } |
740 | } |
724 | } |
741 | |
725 | |
742 | sub face_update { |
726 | sub face_update { |
743 | my ($self, $facenum, $face, $changed) = @_; |
727 | my ($self, $facenum, $face, $changed) = @_; |
… | |
… | |
756 | $self->{music_meta}{$facenum} = $face; |
740 | $self->{music_meta}{$facenum} = $face; |
757 | |
741 | |
758 | ::message ({ markup => "downloaded song #$facenum" }) |
742 | ::message ({ markup => "downloaded song #$facenum" }) |
759 | if $changed; |
743 | if $changed; |
760 | |
744 | |
761 | &::audio_music_set ($self->{songs}); |
745 | &::audio_music_push ($facenum); |
|
|
746 | }; |
|
|
747 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
748 | $cb = sub { |
|
|
749 | $self->{sound_meta}{$facenum} = $face; |
|
|
750 | |
|
|
751 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
752 | if $changed; |
|
|
753 | |
|
|
754 | &::audio_sound_push ($facenum); |
762 | }; |
755 | }; |
763 | } |
756 | } |
764 | |
757 | |
765 | if ($changed) { # new data |
758 | if ($changed) { # new data |
766 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
767 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
768 | |
760 | |
769 | CFPlus::DB::write_file $path, $data, sub { |
761 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
770 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
762 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
771 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
763 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
772 | $face->{path} = $path; |
764 | ::add_license ($face); |
773 | |
|
|
774 | $cb->(); |
765 | $cb->(); |
775 | }; |
|
|
776 | }; |
766 | }; |
|
|
767 | |
777 | } else { |
768 | } else { |
778 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
769 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
770 | ::add_license ($face); |
779 | $cb->(); |
771 | $cb->(); |
780 | } |
772 | } |
781 | } |
773 | } |
782 | } |
774 | } |
783 | |
775 | |
… | |
… | |
813 | @{$self->{face_cb}{$id}}; |
805 | @{$self->{face_cb}{$id}}; |
814 | } |
806 | } |
815 | } |
807 | } |
816 | |
808 | |
817 | sub sound_play { |
809 | sub sound_play { |
818 | my ($self, $x, $y, $soundnum, $type) = @_; |
810 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
819 | |
811 | |
820 | $self->{sound_play}->($x, $y, $soundnum, $type); |
812 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
813 | unless $type & 1; # odd types are silent for future expansion |
821 | } |
814 | } |
822 | |
815 | |
823 | my $LAST_QUERY; # server is stupid, stupid, stupid |
816 | my $LAST_QUERY; # server is stupid, stupid, stupid |
824 | |
817 | |
825 | sub query { |
818 | sub query { |
… | |
… | |
890 | $self->{$type} = $text; |
883 | $self->{$type} = $text; |
891 | } else { |
884 | } else { |
892 | $self->logprint ("msg: ", $text); |
885 | $self->logprint ("msg: ", $text); |
893 | return if $color < 0; # negative color == ignore if not understood |
886 | return if $color < 0; # negative color == ignore if not understood |
894 | |
887 | |
895 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
888 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
896 | |
889 | |
897 | ## try to create single paragraphs of multiple lines sent by the server |
890 | ## try to create single paragraphs of multiple lines sent by the server |
898 | # no longer neecssary with TRT servers |
891 | # no longer neecssary with TRT servers |
899 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
892 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
900 | |
893 | |
… | |
… | |
961 | my ($self) = @_; |
954 | my ($self) = @_; |
962 | |
955 | |
963 | $self->{map_widget}->clr_commands; |
956 | $self->{map_widget}->clr_commands; |
964 | |
957 | |
965 | ::stop_game (); |
958 | ::stop_game (); |
966 | } |
|
|
967 | |
|
|
968 | sub image_info { |
|
|
969 | my ($self, $numfaces) = @_; |
|
|
970 | |
|
|
971 | $self->{num_faces} = $numfaces; |
|
|
972 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
973 | $self->face_prefetch; |
|
|
974 | } |
|
|
975 | |
|
|
976 | sub face_prefetch { |
|
|
977 | my ($self) = @_; |
|
|
978 | |
|
|
979 | return unless $::CFG->{face_prefetch}; |
|
|
980 | |
|
|
981 | if ($self->{num_faces}) { |
|
|
982 | return if @{ $self->{send_queue} || [] }; |
|
|
983 | my $todo = @{ $self->{face_prefetch} } |
|
|
984 | or return; |
|
|
985 | |
|
|
986 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
987 | |
|
|
988 | $self->send ("requestinfo image_sums $face $face"); |
|
|
989 | |
|
|
990 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
991 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
992 | } elsif (!exists $self->{num_faces}) { |
|
|
993 | $self->send ("requestinfo image_info"); |
|
|
994 | |
|
|
995 | $self->{num_faces} = 0; |
|
|
996 | |
|
|
997 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
998 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
999 | } |
|
|
1000 | } |
959 | } |
1001 | |
960 | |
1002 | sub update_floorbox { |
961 | sub update_floorbox { |
1003 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
962 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1004 | return unless $::CONN; |
963 | return unless $::CONN; |