… | |
… | |
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) = @_; |
62 | |
60 | |
63 | $self->send_exti_msg (fx_want => { |
61 | #$self->send ("setup sound 0"); # we use a different protocol |
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
62 | $self->update_fx_want; |
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
66 | }); |
|
|
67 | |
63 | |
68 | if (my $ts = $cap{tileset}) { |
64 | if (my $ts = $cap{tileset}) { |
69 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
65 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
70 | $self->{tileset} = $default; |
66 | $self->{tileset} = $default; |
71 | $self->{tilesize} = $default->[3]; |
67 | $self->{tilesize} = $default->[3]; |
… | |
… | |
185 | or return; |
181 | or return; |
186 | |
182 | |
187 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
183 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
188 | }); |
184 | }); |
189 | |
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 | |
190 | # destroy widgets on logout |
193 | # destroy widgets on logout |
191 | $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 { |
192 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
195 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
193 | $_->destroy |
196 | $_->destroy |
194 | for values %{delete $ws->{w} || {}}; |
197 | for values %{delete $ws->{w} || {}}; |
… | |
… | |
216 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
219 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
217 | |
220 | |
218 | $self |
221 | $self |
219 | } |
222 | } |
220 | |
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 | |
221 | sub logprint { |
233 | sub logprint { |
222 | my ($self, @a) = @_; |
234 | my ($self, @a) = @_; |
223 | |
235 | |
224 | $self->{log_fh} ||= do { |
236 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
225 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
226 | |
|
|
227 | open my $fh, ">>:utf8", $path |
|
|
228 | or die "Couldn't open logfile $path: $!"; |
|
|
229 | |
|
|
230 | $fh->autoflush (1); |
|
|
231 | |
|
|
232 | $fh; |
|
|
233 | }; |
|
|
234 | |
|
|
235 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
236 | |
|
|
237 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
238 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
239 | |
|
|
240 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
241 | } |
237 | } |
242 | |
238 | |
243 | sub _stat_numdiff { |
239 | sub _stat_numdiff { |
244 | my ($self, $name, $old, $new) = @_; |
240 | my ($self, $name, $old, $new) = @_; |
245 | |
241 | |
… | |
… | |
510 | } |
506 | } |
511 | |
507 | |
512 | sub feed_map1a { |
508 | sub feed_map1a { |
513 | my ($self, $data) = @_; |
509 | my ($self, $data) = @_; |
514 | |
510 | |
515 | $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 { |
516 | $self->{map_widget}->update; |
539 | $self->{map_widget}->update; |
|
|
540 | } |
517 | } |
541 | } |
518 | |
542 | |
519 | sub magicmap { |
543 | sub magicmap { |
520 | my ($self, $w, $h, $x, $y, $data) = @_; |
544 | my ($self, $w, $h, $x, $y, $data) = @_; |
521 | |
545 | |
… | |
… | |
528 | my $map_info = delete $self->{map_info} |
552 | my $map_info = delete $self->{map_info} |
529 | or return; |
553 | or return; |
530 | |
554 | |
531 | my ($hash, $x, $y, $w, $h) = @$map_info; |
555 | my ($hash, $x, $y, $w, $h) = @$map_info; |
532 | |
556 | |
533 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
557 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
558 | $self->{map_cache_new}{$hash} = \$data; |
534 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
559 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
535 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
|
|
536 | } |
560 | } |
537 | |
561 | |
538 | sub map_clear { |
562 | sub map_clear { |
539 | my ($self) = @_; |
563 | my ($self) = @_; |
540 | |
564 | |
… | |
… | |
553 | do { |
577 | do { |
554 | $id = pop @{$self->{bg_fetch}} |
578 | $id = pop @{$self->{bg_fetch}} |
555 | or return; |
579 | or return; |
556 | } while $self->{texture}[$id]; |
580 | } while $self->{texture}[$id]; |
557 | |
581 | |
558 | CFPlus::DB::get tilecache => $id, sub { |
582 | CFPlus::DB::exists tilecache => $id, sub { |
559 | my ($data) = @_; |
583 | my ($exists) = @_; |
560 | |
584 | |
561 | return unless $self->{map}; # stop when destroyed |
585 | return unless $self->{map}; # stop when destroyed |
562 | |
586 | |
563 | $self->set_texture ($id => $data) |
587 | if ($exists) { |
564 | if defined $data; |
588 | $self->have_tile ($id); |
|
|
589 | $self->{texture}[$id]->upload; |
|
|
590 | } |
565 | |
591 | |
566 | $self->bg_fetch; |
592 | $self->bg_fetch; |
567 | }; |
593 | }; |
568 | } |
594 | } |
569 | |
595 | |
570 | sub load_map($$$) { |
596 | sub load_map($$$) { |
571 | my ($self, $hash, $x, $y) = @_; |
597 | my ($self, $hash, $x, $y) = @_; |
572 | |
598 | |
573 | my $gen = $self->{map_change_gen}; |
599 | my $gen = $self->{map_change_gen}; |
574 | |
600 | |
575 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
601 | my $cb = sub { |
576 | return unless $gen == $self->{map_change_gen}; |
602 | return unless $gen == $self->{map_change_gen}; |
577 | |
603 | |
578 | my ($data) = @_; |
604 | my ($data) = @_; |
579 | |
605 | |
580 | if (defined $data) { |
606 | if (defined $data) { |
|
|
607 | $self->{map_cache_new}{$hash} = \$data; |
|
|
608 | |
581 | $data = Compress::LZF::decompress $data; |
609 | my $data = Compress::LZF::decompress $data; |
582 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
583 | |
610 | |
584 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
611 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
585 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
612 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
586 | $self->bg_fetch unless $inprogress; |
613 | $self->bg_fetch unless $inprogress; |
587 | } |
614 | } |
588 | }; |
615 | }; |
|
|
616 | |
|
|
617 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
618 | $cb->($$rdata); |
|
|
619 | } else { |
|
|
620 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
|
|
621 | } |
589 | } |
622 | } |
590 | |
623 | |
591 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
624 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
592 | # (server resource,s latency, bandwidth), so this hack is warranted. |
625 | # (server resource,s latency, bandwidth), so this hack is warranted. |
593 | # the right fix is to make real tiled maps with an overview file |
626 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
686 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
719 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
687 | |
720 | |
688 | $self->flush_map; |
721 | $self->flush_map; |
689 | |
722 | |
690 | ++$self->{map_change_gen}; |
723 | ++$self->{map_change_gen}; |
|
|
724 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
691 | |
725 | |
692 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
726 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
693 | |
727 | |
694 | my $mapmapw = $self->{mapmap}->{w}; |
728 | my $mapmapw = $self->{mapmap}->{w}; |
695 | my $mapmaph = $self->{mapmap}->{h}; |
729 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
725 | $self->{map}->set_tileid ($facenum => $id); |
759 | $self->{map}->set_tileid ($facenum => $id); |
726 | |
760 | |
727 | CFPlus::DB::get tilecache => $id, $cb; |
761 | CFPlus::DB::get tilecache => $id, $cb; |
728 | |
762 | |
729 | } elsif ($face->{type} & 1) { # with metadata |
763 | } 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." }); |
|
|
731 | CFPlus::DB::get "res-metadata" => $face->{name}, $cb; |
764 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
732 | } |
765 | } |
733 | } |
766 | } |
734 | |
767 | |
735 | sub face_update { |
768 | sub face_update { |
736 | my ($self, $facenum, $face, $changed) = @_; |
769 | my ($self, $facenum, $face, $changed) = @_; |
737 | |
770 | |
738 | if ($face->{type} == 0) { # FT_FACE |
771 | if ($face->{type} == 0) { # FT_FACE |
739 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
772 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
740 | if $changed; |
773 | if $changed; |
741 | |
774 | |
742 | $self->set_texture ($face->{id} => delete $face->{data}); |
775 | $self->have_tile ($face->{id}); |
743 | |
776 | |
744 | } elsif ($face->{type} & 1) { # split metadata |
777 | } elsif ($face->{type} & 1) { # split metadata |
745 | my $cb = sub { }; |
|
|
746 | |
|
|
747 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
748 | $cb = sub { |
|
|
749 | $self->{music_meta}{$facenum} = $face; |
|
|
750 | |
|
|
751 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
752 | if $changed; |
|
|
753 | |
|
|
754 | &::audio_music_set ($self->{songs}); |
|
|
755 | }; |
|
|
756 | } |
|
|
757 | |
|
|
758 | if ($changed) { # new data |
778 | if ($changed) { # new data |
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
779 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
760 | my $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
761 | |
|
|
762 | CFPlus::DB::write_file $path, $data, sub { |
|
|
763 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
|
|
764 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
780 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
765 | $face->{path} = $path; |
|
|
766 | |
781 | |
767 | $cb->(); |
782 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
768 | }; |
783 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; |
769 | }; |
|
|
770 | } else { |
784 | } else { |
771 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
785 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
772 | $cb->(); |
|
|
773 | } |
786 | } |
|
|
787 | |
|
|
788 | ::add_license ($face); |
|
|
789 | |
|
|
790 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
791 | $self->{music_meta}{$facenum} = $face; |
|
|
792 | |
|
|
793 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
794 | if $changed; |
|
|
795 | |
|
|
796 | &::audio_music_push ($facenum); |
|
|
797 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
798 | $self->{sound_meta}{$facenum} = $face; |
|
|
799 | |
|
|
800 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
801 | if $changed; |
|
|
802 | |
|
|
803 | &::audio_sound_push ($facenum); |
|
|
804 | } |
|
|
805 | |
774 | } |
806 | } |
775 | } |
807 | } |
776 | |
808 | |
777 | sub smooth_update { |
809 | sub smooth_update { |
778 | my ($self, $facenum, $face) = @_; |
810 | my ($self, $facenum, $face) = @_; |
779 | |
811 | |
780 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
812 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
781 | } |
813 | } |
782 | |
814 | |
783 | sub set_texture { |
815 | sub have_tile { |
784 | my ($self, $id, $data) = @_; |
816 | my ($self, $tile) = @_; |
785 | |
817 | |
786 | return unless $self->{map}; |
818 | return unless $self->{map}; |
787 | |
819 | |
788 | $self->{texture}[$id] = my $tex = |
820 | my $tex = $self->{texture}[$tile] ||= |
789 | new_from_image CFPlus::Texture |
821 | new CFPlus::Texture |
790 | $data, minify => 1, mipmap => 1; |
822 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
791 | |
823 | |
792 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
793 | $self->{map_widget}->update; |
|
|
794 | |
|
|
795 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
824 | $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; |
796 | } |
825 | } |
797 | |
826 | |
798 | sub connect_face_update { |
827 | sub connect_face_update { |
799 | my ($self, $id, $cb) = @_; |
828 | my ($self, $id, $cb) = @_; |
800 | |
829 | |
… | |
… | |
806 | @{$self->{face_cb}{$id}}; |
835 | @{$self->{face_cb}{$id}}; |
807 | } |
836 | } |
808 | } |
837 | } |
809 | |
838 | |
810 | sub sound_play { |
839 | sub sound_play { |
811 | my ($self, $x, $y, $soundnum, $type) = @_; |
840 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
812 | |
841 | |
813 | $self->{sound_play}->($x, $y, $soundnum, $type); |
842 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
843 | unless $type & 1; # odd types are silent for future expansion |
814 | } |
844 | } |
815 | |
845 | |
816 | my $LAST_QUERY; # server is stupid, stupid, stupid |
846 | my $LAST_QUERY; # server is stupid, stupid, stupid |
817 | |
847 | |
818 | sub query { |
848 | sub query { |
… | |
… | |
883 | $self->{$type} = $text; |
913 | $self->{$type} = $text; |
884 | } else { |
914 | } else { |
885 | $self->logprint ("msg: ", $text); |
915 | $self->logprint ("msg: ", $text); |
886 | return if $color < 0; # negative color == ignore if not understood |
916 | return if $color < 0; # negative color == ignore if not understood |
887 | |
917 | |
888 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
918 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
889 | |
919 | |
890 | ## try to create single paragraphs of multiple lines sent by the server |
920 | ## try to create single paragraphs of multiple lines sent by the server |
891 | # no longer neecssary with TRT servers |
921 | # no longer neecssary with TRT servers |
892 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
922 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
893 | |
923 | |
894 | ::message ({ fg => $fg, markup => $_ }) |
924 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
895 | for split /\n/, $text; |
925 | for split /\n/, $text; |
896 | |
926 | |
897 | $self->{statusbox}->add ($text, |
927 | $self->{statusbox}->add ($text, |
898 | group => $text, |
928 | group => $text, |
899 | fg => $fg, |
929 | fg => $fg, |
… | |
… | |
956 | $self->{map_widget}->clr_commands; |
986 | $self->{map_widget}->clr_commands; |
957 | |
987 | |
958 | ::stop_game (); |
988 | ::stop_game (); |
959 | } |
989 | } |
960 | |
990 | |
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 | } |
|
|
994 | |
|
|
995 | sub update_floorbox { |
991 | sub update_floorbox { |
996 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
992 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
997 | return unless $::CONN; |
993 | return unless $::CONN; |
998 | |
994 | |
999 | $::FLOORBOX->clear; |
995 | $::FLOORBOX->clear; |
… | |
… | |
1028 | } |
1024 | } |
1029 | |
1025 | |
1030 | $::FLOORBOX->add_at (@add); |
1026 | $::FLOORBOX->add_at (@add); |
1031 | }); |
1027 | }); |
1032 | |
1028 | |
1033 | $::WANT_REFRESH++; |
1029 | $::WANT_REFRESH->start; |
1034 | } |
1030 | } |
1035 | |
1031 | |
1036 | sub set_opencont { |
1032 | sub set_opencont { |
1037 | my ($conn, $tag, $name) = @_; |
1033 | my ($conn, $tag, $name) = @_; |
1038 | $conn->{open_container} = $tag; |
1034 | $conn->{open_container} = $tag; |
… | |
… | |
1155 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1151 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1156 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1152 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1157 | . "map size $self->{mapw}×$self->{maph}\n" |
1153 | . "map size $self->{mapw}×$self->{maph}\n" |
1158 | ); |
1154 | ); |
1159 | |
1155 | |
1160 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
1161 | } |
1156 | } |
1162 | |
1157 | |
1163 | sub logged_in { |
1158 | sub logged_in { |
1164 | my ($self) = @_; |
1159 | my ($self) = @_; |
1165 | |
1160 | |
… | |
… | |
1185 | |
1180 | |
1186 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1181 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1187 | $self->send_command ("output-count $::CFG->{output_count}"); |
1182 | $self->send_command ("output-count $::CFG->{output_count}"); |
1188 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1183 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1189 | $self->send_command ("pickup $::CFG->{pickup}"); |
1184 | $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 | } |
1185 | } |
1199 | |
1186 | |
1200 | sub lookat { |
1187 | sub lookat { |
1201 | my ($self, $x, $y) = @_; |
1188 | my ($self, $x, $y) = @_; |
1202 | |
1189 | |