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.151 by root, Sun Aug 12 09:39:49 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) = @_;
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];
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 220
225 $self 221 $self
226} 222}
227 223
224sub 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
228sub logprint { 233sub logprint {
229 my ($self, @a) = @_; 234 my ($self, @a) = @_;
230 235
231 $self->{log_fh} ||= do { 236 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} 237}
249 238
250sub _stat_numdiff { 239sub _stat_numdiff {
251 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
252 241
517} 506}
518 507
519sub feed_map1a { 508sub feed_map1a {
520 my ($self, $data) = @_; 509 my ($self, $data) = @_;
521 510
522 $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 {
523 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
524} 541}
525 542
526sub magicmap { 543sub magicmap {
527 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
528 545
560 do { 577 do {
561 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
562 or return; 579 or return;
563 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
564 581
565 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
566 my ($data) = @_; 583 my ($exists) = @_;
567 584
568 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
569 586
570 $self->set_texture ($id => $data) 587 if ($exists) {
571 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
572 591
573 $self->bg_fetch; 592 $self->bg_fetch;
574 }; 593 };
575} 594}
576 595
732 $self->{map}->set_tileid ($facenum => $id); 751 $self->{map}->set_tileid ($facenum => $id);
733 752
734 CFPlus::DB::get tilecache => $id, $cb; 753 CFPlus::DB::get tilecache => $id, $cb;
735 754
736 } elsif ($face->{type} & 1) { # with metadata 755 } 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." });
738 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 756 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 } 757 }
740} 758}
741 759
742sub face_update { 760sub face_update {
743 my ($self, $facenum, $face, $changed) = @_; 761 my ($self, $facenum, $face, $changed) = @_;
744 762
745 if ($face->{type} == 0) { # FT_FACE 763 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 765 if $changed;
748 766
749 $self->set_texture ($face->{id} => delete $face->{data}); 767 $self->have_tile ($face->{id});
750 768
751 } elsif ($face->{type} & 1) { # split metadata 769 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_set ($self->{songs});
762 };
763 }
764
765 if ($changed) { # new data 770 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 CFPlus::DB::write_file $path, $data, sub {
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json); 772 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773 773
774 $cb->(); 774 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775 }; 775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
776 };
777 } else { 776 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779 $cb->();
780 } 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
781 } 798 }
782} 799}
783 800
784sub smooth_update { 801sub smooth_update {
785 my ($self, $facenum, $face) = @_; 802 my ($self, $facenum, $face) = @_;
786 803
787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
788} 805}
789 806
790sub set_texture { 807sub have_tile {
791 my ($self, $id, $data) = @_; 808 my ($self, $tile) = @_;
792 809
793 return unless $self->{map}; 810 return unless $self->{map};
794 811
795 $self->{texture}[$id] = my $tex = 812 my $tex = $self->{texture}[$tile] ||=
796 new_from_image CFPlus::Texture 813 new CFPlus::Texture
797 $data, minify => 1, mipmap => 1; 814 tile => $tile, minify => 1, mipmap => 1, delay => 1;
798 815
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}) || []}; 816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
803} 817}
804 818
805sub connect_face_update { 819sub connect_face_update {
806 my ($self, $id, $cb) = @_; 820 my ($self, $id, $cb) = @_;
807 821
813 @{$self->{face_cb}{$id}}; 827 @{$self->{face_cb}{$id}};
814 } 828 }
815} 829}
816 830
817sub sound_play { 831sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 832 my ($self, $type, $face, $dx, $dy, $vol) = @_;
819 833
820 $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
821} 836}
822 837
823my $LAST_QUERY; # server is stupid, stupid, stupid 838my $LAST_QUERY; # server is stupid, stupid, stupid
824 839
825sub query { 840sub query {
890 $self->{$type} = $text; 905 $self->{$type} = $text;
891 } else { 906 } else {
892 $self->logprint ("msg: ", $text); 907 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 908 return if $color < 0; # negative color == ignore if not understood
894 909
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 910 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
896 911
897 ## 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
898 # no longer neecssary with TRT servers 913 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 914 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 915
963 $self->{map_widget}->clr_commands; 978 $self->{map_widget}->clr_commands;
964 979
965 ::stop_game (); 980 ::stop_game ();
966} 981}
967 982
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}
1001
1002sub update_floorbox { 983sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 984 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 985 return unless $::CONN;
1005 986
1006 $::FLOORBOX->clear; 987 $::FLOORBOX->clear;
1035 } 1016 }
1036 1017
1037 $::FLOORBOX->add_at (@add); 1018 $::FLOORBOX->add_at (@add);
1038 }); 1019 });
1039 1020
1040 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
1041} 1022}
1042 1023
1043sub set_opencont { 1024sub set_opencont {
1044 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
1045 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines