ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.136 by elmex, Fri Jul 27 18:04:42 2007 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 2007 UTC

… …
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
228sub logprint { 228sub 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
250sub _stat_numdiff { 234sub _stat_numdiff {
251 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
252 236
… …
560 do { 544 do {
561 $id = pop @{$self->{bg_fetch}} 545 $id = pop @{$self->{bg_fetch}}
562 or return; 546 or return;
563 } while $self->{texture}[$id]; 547 } while $self->{texture}[$id];
564 548
565 CFPlus::DB::get tilecache => $id, sub { 549 CFPlus::DB::exists tilecache => $id, sub {
566 my ($data) = @_; 550 my ($exists) = @_;
567 551
568 return unless $self->{map}; # stop when destroyed 552 return unless $self->{map}; # stop when destroyed
569 553
570 $self->set_texture ($id => $data) 554 $self->have_tile ($id)
571 if defined $data; 555 if $exists;
572 556
573 $self->bg_fetch; 557 $self->bg_fetch;
574 }; 558 };
575} 559}
576 560
… …
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
742sub face_update { 726sub face_update {
743 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
744 728
745 if ($face->{type} == 0) { # FT_FACE 729 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 731 if $changed;
748 732
749 $self->set_texture ($face->{id} => delete $face->{data}); 733 $self->have_tile ($face->{id});
750 734
751 } elsif ($face->{type} & 1) { # split metadata 735 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { }; 736 my $cb = sub { };
753 737
754 if ($face->{type} == 3) { # FT_MUSIC 738 if ($face->{type} == 3) { # FT_MUSIC
… …
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
… …
785 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
786 778
787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
788} 780}
789 781
790sub set_texture { 782sub have_tile {
791 my ($self, $id, $data) = @_; 783 my ($self, $tile) = @_;
792 784
793 return unless $self->{map}; 785 return unless $self->{map};
794 786
795 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$tile] ||= my $tex =
796 new_from_image CFPlus::Texture 788 new CFPlus::Texture
797 $data, minify => 1, mipmap => 1; 789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
798 790
799 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
800 $self->{map_widget}->update;
801
802 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
803} 792}
804 793
805sub connect_face_update { 794sub connect_face_update {
806 my ($self, $id, $cb) = @_; 795 my ($self, $id, $cb) = @_;
807 796
… …
813 @{$self->{face_cb}{$id}}; 802 @{$self->{face_cb}{$id}};
814 } 803 }
815} 804}
816 805
817sub sound_play { 806sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
819 808
820 $self->{sound_play}->($x, $y, $soundnum, $type); 809 &::audio_sound_play ($face, $dx, $dy, $vol)
810 unless $type & 1; # odd types are silent for future expansion
821} 811}
822 812
823my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
824 814
825sub query { 815sub query {
… …
890 $self->{$type} = $text; 880 $self->{$type} = $text;
891 } else { 881 } else {
892 $self->logprint ("msg: ", $text); 882 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 883 return if $color < 0; # negative color == ignore if not understood
894 884
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
896 886
897 ## try to create single paragraphs of multiple lines sent by the server 887 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers 888 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 890
… …
961 my ($self) = @_; 951 my ($self) = @_;
962 952
963 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
964 954
965 ::stop_game (); 955 ::stop_game ();
966}
967
968sub image_info {
969 my ($self, $numfaces) = @_;
970
971 $self->{num_faces} = $numfaces;
972 $self->{face_prefetch} = [1 .. $numfaces];
973 $self->face_prefetch;
974}
975
976sub 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} 956}
1001 957
1002sub update_floorbox { 958sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 960 return unless $::CONN;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines