| … | |
… | |
| 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) = @_; |
| 62 | |
60 | |
| … | |
… | |
| 228 | } |
226 | } |
| 229 | |
227 | |
| 230 | sub logprint { |
228 | sub logprint { |
| 231 | my ($self, @a) = @_; |
229 | my ($self, @a) = @_; |
| 232 | |
230 | |
| 233 | $self->{log_fh} ||= do { |
231 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
| 234 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
| 235 | |
|
|
| 236 | open my $fh, ">>:utf8", $path |
|
|
| 237 | or die "Couldn't open logfile $path: $!"; |
|
|
| 238 | |
|
|
| 239 | $fh->autoflush (1); |
|
|
| 240 | |
|
|
| 241 | $fh; |
|
|
| 242 | }; |
|
|
| 243 | |
|
|
| 244 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
| 245 | |
|
|
| 246 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
| 247 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
| 248 | |
|
|
| 249 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
| 250 | } |
232 | } |
| 251 | |
233 | |
| 252 | sub _stat_numdiff { |
234 | sub _stat_numdiff { |
| 253 | my ($self, $name, $old, $new) = @_; |
235 | my ($self, $name, $old, $new) = @_; |
| 254 | |
236 | |
| … | |
… | |
| 735 | |
717 | |
| 736 | CFPlus::DB::get tilecache => $id, $cb; |
718 | CFPlus::DB::get tilecache => $id, $cb; |
| 737 | |
719 | |
| 738 | } elsif ($face->{type} & 1) { # with metadata |
720 | } elsif ($face->{type} & 1) { # with metadata |
| 739 | #::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." }); |
| 740 | CFPlus::DB::get "res-metadata" => $face->{name}, $cb; |
722 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
| 741 | } |
723 | } |
| 742 | } |
724 | } |
| 743 | |
725 | |
| 744 | sub face_update { |
726 | sub face_update { |
| 745 | my ($self, $facenum, $face, $changed) = @_; |
727 | my ($self, $facenum, $face, $changed) = @_; |
| … | |
… | |
| 750 | |
732 | |
| 751 | $self->set_texture ($face->{id} => delete $face->{data}); |
733 | $self->set_texture ($face->{id} => delete $face->{data}); |
| 752 | |
734 | |
| 753 | } elsif ($face->{type} & 1) { # split metadata |
735 | } elsif ($face->{type} & 1) { # split metadata |
| 754 | my $cb = sub { }; |
736 | my $cb = sub { }; |
| 755 | my $path; |
|
|
| 756 | |
737 | |
| 757 | if ($face->{type} == 3) { # FT_MUSIC |
738 | if ($face->{type} == 3) { # FT_MUSIC |
| 758 | # store externally |
|
|
| 759 | $path = CFPlus::DB::path_of_res $face->{name}; |
|
|
| 760 | |
|
|
| 761 | $cb = sub { |
739 | $cb = sub { |
| 762 | $self->{music_meta}{$facenum} = $face; |
740 | $self->{music_meta}{$facenum} = $face; |
| 763 | |
741 | |
| 764 | ::message ({ markup => "downloaded song #$facenum" }) |
742 | ::message ({ markup => "downloaded song #$facenum" }) |
| 765 | if $changed; |
743 | if $changed; |
| 766 | |
744 | |
| 767 | &::audio_music_set ($self->{songs}); |
745 | &::audio_music_push ($facenum); |
| 768 | }; |
746 | }; |
| 769 | } elsif ($face->{type} == 5) { # FT_SOUND |
747 | } elsif ($face->{type} == 5) { # FT_SOUND |
| 770 | $cb = sub { |
748 | $cb = sub { |
| 771 | $self->{sound_meta}{$facenum} = $face; |
749 | $self->{sound_meta}{$facenum} = $face; |
| 772 | |
750 | |
| 773 | use Data::Dumper; warn Dumper $face;#d# |
|
|
| 774 | ::message ({ markup => "downloaded sound #$facenum" }) |
751 | ::message ({ markup => "downloaded sound #$facenum" }) |
| 775 | if $changed; |
752 | if $changed; |
|
|
753 | |
|
|
754 | &::audio_sound_push ($facenum); |
| 776 | }; |
755 | }; |
| 777 | } |
756 | } |
| 778 | |
|
|
| 779 | |
757 | |
| 780 | if ($changed) { # new data |
758 | if ($changed) { # new data |
| 781 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
| 782 | |
760 | |
| 783 | my $put_cb = sub { |
761 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
| 784 | CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { |
762 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
| 785 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
763 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
| 786 | $face->{path} = $path; |
764 | ::add_license ($face); |
| 787 | |
|
|
| 788 | $cb->(); |
765 | $cb->(); |
| 789 | }; |
|
|
| 790 | }; |
766 | }; |
| 791 | |
767 | |
| 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 | } |
|
|
| 797 | } else { |
768 | } else { |
| 798 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
769 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
| 799 | $face->{path} = $path; |
770 | ::add_license ($face); |
| 800 | $cb->(); |
771 | $cb->(); |
| 801 | } |
772 | } |
| 802 | } |
773 | } |
| 803 | } |
774 | } |
| 804 | |
775 | |
| … | |
… | |
| 834 | @{$self->{face_cb}{$id}}; |
805 | @{$self->{face_cb}{$id}}; |
| 835 | } |
806 | } |
| 836 | } |
807 | } |
| 837 | |
808 | |
| 838 | sub sound_play { |
809 | sub sound_play { |
| 839 | my ($self, $x, $y, $soundnum, $type) = @_; |
810 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
| 840 | warn "sound play <@_>\n";#d# |
|
|
| 841 | |
811 | |
| 842 | #$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 |
| 843 | } |
814 | } |
| 844 | |
815 | |
| 845 | my $LAST_QUERY; # server is stupid, stupid, stupid |
816 | my $LAST_QUERY; # server is stupid, stupid, stupid |
| 846 | |
817 | |
| 847 | sub query { |
818 | sub query { |
