… | |
… | |
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, |
26 | ywidget => 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 | return unless $::CFG->{bgm_enable}; |
|
|
57 | |
|
|
58 | my $faces = $ev{faces}; |
|
|
59 | my @songs; |
|
|
60 | |
|
|
61 | # request music from server if appropriate |
|
|
62 | if (my $faces = $ev{faces}) { |
|
|
63 | for (@$faces) { |
|
|
64 | my ($face, $pri, $chksum) = @$_; |
|
|
65 | utf8::downgrade $chksum; |
|
|
66 | |
|
|
67 | $chksum = unpack "H*", $chksum; |
|
|
68 | $self->{music_map}{$face} = $chksum; |
|
|
69 | |
|
|
70 | # check if already cached |
|
|
71 | CFPlus::DB::get "res-metadata" => $chksum, sub { |
|
|
72 | my ($meta_json) = @_; |
|
|
73 | my $path = CFPlus::DB::path_of_res $chksum; |
|
|
74 | |
|
|
75 | if (defined $meta_json) { |
|
|
76 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
77 | $meta->{path} = $path; |
|
|
78 | $self->{music_meta}{$chksum} = $meta; |
|
|
79 | &::audio_music_set ($self->{songs}); |
|
|
80 | } else { |
|
|
81 | ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
82 | $self->ask_face ($face, -100 - $pri, undef, sub { |
|
|
83 | my $len = length $_[1]; |
|
|
84 | my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; |
|
|
85 | |
|
|
86 | CFPlus::DB::write_file $path, $data, sub { |
|
|
87 | CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { |
|
|
88 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
89 | $meta->{path} = $path; |
|
|
90 | $self->{music_meta}{$chksum} = $meta; |
|
|
91 | |
|
|
92 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
|
|
93 | &::audio_music_set ($self->{songs}); |
|
|
94 | }; |
|
|
95 | }; |
|
|
96 | }); |
|
|
97 | } |
|
|
98 | } |
|
|
99 | } |
|
|
100 | } |
|
|
101 | |
|
|
102 | if (my $play = $ev{play}) { |
|
|
103 | &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); |
|
|
104 | } |
|
|
105 | }); |
56 | }); |
106 | |
57 | |
107 | $self->connect_ext (capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
108 | my (%cap) = @_; |
59 | my (%cap) = @_; |
|
|
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | $self->update_fx_want; |
109 | |
63 | |
110 | if (my $ts = $cap{tileset}) { |
64 | if (my $ts = $cap{tileset}) { |
111 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
65 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
112 | $self->{tileset} = $default; |
66 | $self->{tileset} = $default; |
113 | $self->{tilesize} = $default->[3]; |
67 | $self->{tilesize} = $default->[3]; |
… | |
… | |
227 | or return; |
181 | or return; |
228 | |
182 | |
229 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
183 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
230 | }); |
184 | }); |
231 | |
185 | |
|
|
186 | # message window |
|
|
187 | $self->connect_ext (channel_info => sub { |
|
|
188 | my ($info) = @_; |
|
|
189 | $self->{channels}->{$info->{id}} = $info; |
|
|
190 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
191 | }); |
|
|
192 | |
232 | # destroy widgets on logout |
193 | # destroy widgets on logout |
233 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
194 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
234 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
195 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
235 | $_->destroy |
196 | $_->destroy |
236 | for values %{delete $ws->{w} || {}}; |
197 | for values %{delete $ws->{w} || {}}; |
… | |
… | |
258 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
219 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
259 | |
220 | |
260 | $self |
221 | $self |
261 | } |
222 | } |
262 | |
223 | |
|
|
224 | sub update_fx_want { |
|
|
225 | my ($self) = @_; |
|
|
226 | |
|
|
227 | $self->send_exti_msg (fx_want => { |
|
|
228 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
229 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
230 | }); |
|
|
231 | } |
|
|
232 | |
263 | sub logprint { |
233 | sub logprint { |
264 | my ($self, @a) = @_; |
234 | my ($self, @a) = @_; |
265 | |
235 | |
266 | $self->{log_fh} ||= do { |
236 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
267 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
268 | |
|
|
269 | open my $fh, ">>:utf8", $path |
|
|
270 | or die "Couldn't open logfile $path: $!"; |
|
|
271 | |
|
|
272 | $fh->autoflush (1); |
|
|
273 | |
|
|
274 | $fh; |
|
|
275 | }; |
|
|
276 | |
|
|
277 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
278 | |
|
|
279 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
280 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
281 | |
|
|
282 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
283 | } |
237 | } |
284 | |
238 | |
285 | sub _stat_numdiff { |
239 | sub _stat_numdiff { |
286 | my ($self, $name, $old, $new) = @_; |
240 | my ($self, $name, $old, $new) = @_; |
287 | |
241 | |
… | |
… | |
552 | } |
506 | } |
553 | |
507 | |
554 | sub feed_map1a { |
508 | sub feed_map1a { |
555 | my ($self, $data) = @_; |
509 | my ($self, $data) = @_; |
556 | |
510 | |
557 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
511 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
512 | my $delay; |
|
|
513 | |
|
|
514 | for my $tile (@$missing) { |
|
|
515 | next if $self->{delay}{$tile}; |
|
|
516 | |
|
|
517 | $delay = 1; |
|
|
518 | |
|
|
519 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
520 | $tex->upload; |
|
|
521 | } else { |
|
|
522 | $self->{delay}{$tile} = 1; |
|
|
523 | |
|
|
524 | # we assume the face is in-flight and will eventually come |
|
|
525 | push @{$self->{face_cb}{$tile}}, sub { |
|
|
526 | delete $self->{delay}{$tile}; |
|
|
527 | $_[0]->upload; |
|
|
528 | }; |
|
|
529 | } |
|
|
530 | } |
|
|
531 | |
|
|
532 | if ($delay) { |
|
|
533 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
534 | Event->timer (after => 0.03, cb => sub { |
|
|
535 | $_[0]->w->cancel; |
|
|
536 | $self->{map_widget}->update; |
|
|
537 | }); |
|
|
538 | } else { |
558 | $self->{map_widget}->update; |
539 | $self->{map_widget}->update; |
|
|
540 | } |
559 | } |
541 | } |
560 | |
542 | |
561 | sub magicmap { |
543 | sub magicmap { |
562 | my ($self, $w, $h, $x, $y, $data) = @_; |
544 | my ($self, $w, $h, $x, $y, $data) = @_; |
563 | |
545 | |
… | |
… | |
595 | do { |
577 | do { |
596 | $id = pop @{$self->{bg_fetch}} |
578 | $id = pop @{$self->{bg_fetch}} |
597 | or return; |
579 | or return; |
598 | } while $self->{texture}[$id]; |
580 | } while $self->{texture}[$id]; |
599 | |
581 | |
600 | CFPlus::DB::get tilecache => $id, sub { |
582 | CFPlus::DB::exists tilecache => $id, sub { |
601 | my ($data) = @_; |
583 | my ($exists) = @_; |
602 | |
584 | |
603 | return unless $self->{map}; # stop when destroyed |
585 | return unless $self->{map}; # stop when destroyed |
604 | |
586 | |
605 | $self->set_texture ($id => $data) |
587 | $self->have_tile ($id) |
606 | if defined $data; |
588 | if $exists; |
|
|
589 | |
|
|
590 | $self->{texture}[$id]->upload; |
607 | |
591 | |
608 | $self->bg_fetch; |
592 | $self->bg_fetch; |
609 | }; |
593 | }; |
610 | } |
594 | } |
611 | |
595 | |
… | |
… | |
756 | } |
740 | } |
757 | |
741 | |
758 | sub face_find { |
742 | sub face_find { |
759 | my ($self, $facenum, $face, $cb) = @_; |
743 | my ($self, $facenum, $face, $cb) = @_; |
760 | |
744 | |
761 | my $hash = "$face->{chksum},$face->{name}"; |
745 | if ($face->{type} == 0) { # FT_FACE |
762 | |
|
|
763 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
746 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
764 | |
747 | |
765 | $face->{id} = $id; |
748 | $face->{id} = $id; |
766 | $self->{faceid}[$facenum] = $id; |
749 | $self->{faceid}[$facenum] = $id; |
767 | |
750 | |
768 | $self->{map}->set_tileid ($facenum => $id); |
751 | $self->{map}->set_tileid ($facenum => $id); |
769 | |
752 | |
770 | CFPlus::DB::get tilecache => $id, $cb; |
753 | CFPlus::DB::get tilecache => $id, $cb; |
|
|
754 | |
|
|
755 | } elsif ($face->{type} & 1) { # with metadata |
|
|
756 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
757 | } |
771 | } |
758 | } |
772 | |
759 | |
773 | sub face_update { |
760 | sub face_update { |
774 | my ($self, $facenum, $face, $changed) = @_; |
761 | my ($self, $facenum, $face, $changed) = @_; |
775 | |
762 | |
|
|
763 | if ($face->{type} == 0) { # FT_FACE |
776 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
764 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
777 | if $changed; |
765 | if $changed; |
778 | |
766 | |
779 | $self->set_texture ($face->{id} => delete $face->{image}); |
767 | $self->have_tile ($face->{id}); |
|
|
768 | |
|
|
769 | } elsif ($face->{type} & 1) { # split metadata |
|
|
770 | if ($changed) { # new data |
|
|
771 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
772 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
|
|
773 | |
|
|
774 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
775 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; |
|
|
776 | } else { |
|
|
777 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
778 | } |
|
|
779 | |
|
|
780 | ::add_license ($face); |
|
|
781 | |
|
|
782 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
783 | $self->{music_meta}{$facenum} = $face; |
|
|
784 | |
|
|
785 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
786 | if $changed; |
|
|
787 | |
|
|
788 | &::audio_music_push ($facenum); |
|
|
789 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
790 | $self->{sound_meta}{$facenum} = $face; |
|
|
791 | |
|
|
792 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
793 | if $changed; |
|
|
794 | |
|
|
795 | &::audio_sound_push ($facenum); |
|
|
796 | } |
|
|
797 | |
|
|
798 | } |
780 | } |
799 | } |
781 | |
800 | |
782 | sub smooth_update { |
801 | sub smooth_update { |
783 | my ($self, $facenum, $face) = @_; |
802 | my ($self, $facenum, $face) = @_; |
784 | |
803 | |
785 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
804 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
786 | } |
805 | } |
787 | |
806 | |
788 | sub set_texture { |
807 | sub have_tile { |
789 | my ($self, $id, $data) = @_; |
808 | my ($self, $tile) = @_; |
790 | |
809 | |
791 | return unless $self->{map}; |
810 | return unless $self->{map}; |
792 | |
811 | |
793 | $self->{texture}[$id] = my $tex = |
812 | my $tex = $self->{texture}[$tile] ||= |
794 | new_from_image CFPlus::Texture |
813 | new CFPlus::Texture |
795 | $data, minify => 1, mipmap => 1; |
814 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
796 | |
815 | |
797 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
798 | $self->{map_widget}->update; |
|
|
799 | |
|
|
800 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
816 | $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; |
801 | } |
817 | } |
802 | |
818 | |
803 | sub connect_face_update { |
819 | sub connect_face_update { |
804 | my ($self, $id, $cb) = @_; |
820 | my ($self, $id, $cb) = @_; |
805 | |
821 | |
… | |
… | |
811 | @{$self->{face_cb}{$id}}; |
827 | @{$self->{face_cb}{$id}}; |
812 | } |
828 | } |
813 | } |
829 | } |
814 | |
830 | |
815 | sub sound_play { |
831 | sub sound_play { |
816 | my ($self, $x, $y, $soundnum, $type) = @_; |
832 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
817 | |
833 | |
818 | $self->{sound_play}->($x, $y, $soundnum, $type); |
834 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
835 | unless $type & 1; # odd types are silent for future expansion |
819 | } |
836 | } |
820 | |
837 | |
821 | my $LAST_QUERY; # server is stupid, stupid, stupid |
838 | my $LAST_QUERY; # server is stupid, stupid, stupid |
822 | |
839 | |
823 | sub query { |
840 | sub query { |
… | |
… | |
888 | $self->{$type} = $text; |
905 | $self->{$type} = $text; |
889 | } else { |
906 | } else { |
890 | $self->logprint ("msg: ", $text); |
907 | $self->logprint ("msg: ", $text); |
891 | return if $color < 0; # negative color == ignore if not understood |
908 | return if $color < 0; # negative color == ignore if not understood |
892 | |
909 | |
893 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
910 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
894 | |
911 | |
895 | ## try to create single paragraphs of multiple lines sent by the server |
912 | ## try to create single paragraphs of multiple lines sent by the server |
896 | # no longer neecssary with TRT servers |
913 | # no longer neecssary with TRT servers |
897 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
914 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
898 | |
915 | |
899 | ::message ({ fg => $fg, markup => $_ }) |
916 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
900 | for split /\n/, $text; |
917 | for split /\n/, $text; |
901 | |
918 | |
902 | $self->{statusbox}->add ($text, |
919 | $self->{statusbox}->add ($text, |
903 | group => $text, |
920 | group => $text, |
904 | fg => $fg, |
921 | fg => $fg, |
… | |
… | |
961 | $self->{map_widget}->clr_commands; |
978 | $self->{map_widget}->clr_commands; |
962 | |
979 | |
963 | ::stop_game (); |
980 | ::stop_game (); |
964 | } |
981 | } |
965 | |
982 | |
966 | sub image_info { |
|
|
967 | my ($self, $numfaces) = @_; |
|
|
968 | |
|
|
969 | $self->{num_faces} = $numfaces; |
|
|
970 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
971 | $self->face_prefetch; |
|
|
972 | } |
|
|
973 | |
|
|
974 | sub face_prefetch { |
|
|
975 | my ($self) = @_; |
|
|
976 | |
|
|
977 | return unless $::CFG->{face_prefetch}; |
|
|
978 | |
|
|
979 | if ($self->{num_faces}) { |
|
|
980 | return if @{ $self->{send_queue} || [] }; |
|
|
981 | my $todo = @{ $self->{face_prefetch} } |
|
|
982 | or return; |
|
|
983 | |
|
|
984 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
985 | |
|
|
986 | $self->send ("requestinfo image_sums $face $face"); |
|
|
987 | |
|
|
988 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
989 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
990 | } elsif (!exists $self->{num_faces}) { |
|
|
991 | $self->send ("requestinfo image_info"); |
|
|
992 | |
|
|
993 | $self->{num_faces} = 0; |
|
|
994 | |
|
|
995 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
996 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
997 | } |
|
|
998 | } |
|
|
999 | |
|
|
1000 | sub update_floorbox { |
983 | sub update_floorbox { |
1001 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
984 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1002 | return unless $::CONN; |
985 | return unless $::CONN; |
1003 | |
986 | |
1004 | $::FLOORBOX->clear; |
987 | $::FLOORBOX->clear; |
… | |
… | |
1033 | } |
1016 | } |
1034 | |
1017 | |
1035 | $::FLOORBOX->add_at (@add); |
1018 | $::FLOORBOX->add_at (@add); |
1036 | }); |
1019 | }); |
1037 | |
1020 | |
1038 | $::WANT_REFRESH++; |
1021 | $::WANT_REFRESH->start; |
1039 | } |
1022 | } |
1040 | |
1023 | |
1041 | sub set_opencont { |
1024 | sub set_opencont { |
1042 | my ($conn, $tag, $name) = @_; |
1025 | my ($conn, $tag, $name) = @_; |
1043 | $conn->{open_container} = $tag; |
1026 | $conn->{open_container} = $tag; |
… | |
… | |
1160 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1143 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1161 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1144 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1162 | . "map size $self->{mapw}×$self->{maph}\n" |
1145 | . "map size $self->{mapw}×$self->{maph}\n" |
1163 | ); |
1146 | ); |
1164 | |
1147 | |
1165 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
1166 | } |
1148 | } |
1167 | |
1149 | |
1168 | sub logged_in { |
1150 | sub logged_in { |
1169 | my ($self) = @_; |
1151 | my ($self) = @_; |
1170 | |
1152 | |
… | |
… | |
1190 | |
1172 | |
1191 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1173 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1192 | $self->send_command ("output-count $::CFG->{output_count}"); |
1174 | $self->send_command ("output-count $::CFG->{output_count}"); |
1193 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1175 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1194 | $self->send_command ("pickup $::CFG->{pickup}"); |
1176 | $self->send_command ("pickup $::CFG->{pickup}"); |
1195 | } |
|
|
1196 | |
|
|
1197 | sub buildat { |
|
|
1198 | my ($self, $builditem, $x, $y) = @_; |
|
|
1199 | |
|
|
1200 | if ($self->{cfplus_ext}) { |
|
|
1201 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
1202 | } |
|
|
1203 | } |
1177 | } |
1204 | |
1178 | |
1205 | sub lookat { |
1179 | sub lookat { |
1206 | my ($self, $x, $y) = @_; |
1180 | my ($self, $x, $y) = @_; |
1207 | |
1181 | |