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.143 by root, Tue Jul 31 02:03:13 2007 UTC vs.
Revision 1.148 by root, Fri Aug 10 04:02:13 2007 UTC

… …
57 57
58 $self->connect_ext (capabilities => sub { 58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_; 59 my (%cap) = @_;
60 60
61 #$self->send ("setup sound 0"); # we use a different protocol 61 #$self->send ("setup sound 0"); # we use a different protocol
62 62 $self->update_fx_want;
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
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 $self->have_tile ($id)
571 if defined $data; 588 if $exists;
572 589
573 $self->bg_fetch; 590 $self->bg_fetch;
574 }; 591 };
575} 592}
576 593
… …
732 $self->{map}->set_tileid ($facenum => $id); 749 $self->{map}->set_tileid ($facenum => $id);
733 750
734 CFPlus::DB::get tilecache => $id, $cb; 751 CFPlus::DB::get tilecache => $id, $cb;
735 752
736 } elsif ($face->{type} & 1) { # with metadata 753 } 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_meta => $face->{name}, $cb; 754 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 } 755 }
740} 756}
741 757
742sub face_update { 758sub face_update {
… …
744 760
745 if ($face->{type} == 0) { # FT_FACE 761 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 762 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 763 if $changed;
748 764
749 $self->set_texture ($face->{id} => delete $face->{data}); 765 $self->have_tile ($face->{id});
750 766
751 } elsif ($face->{type} & 1) { # split metadata 767 } 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_push ($facenum);
762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
771 };
772 }
773
774 if ($changed) { # new data 768 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 769 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
770 $face->{meta} = $self->{json_coder}->decode ($meta_json);
776 771
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 772 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 773 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
780 $cb->();
781 };
782
783 } else { 774 } else {
784 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 775 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
785 $cb->();
786 } 776 }
777
778 ::add_license ($face);
779
780 if ($face->{type} == 3) { # FT_MUSIC
781 $self->{music_meta}{$facenum} = $face;
782
783 ::message ({ markup => "downloaded song #$facenum" })
784 if $changed;
785
786 &::audio_music_push ($facenum);
787 } elsif ($face->{type} == 5) { # FT_SOUND
788 $self->{sound_meta}{$facenum} = $face;
789
790 ::message ({ markup => "downloaded sound #$facenum" })
791 if $changed;
792
793 &::audio_sound_push ($facenum);
794 }
795
787 } 796 }
788} 797}
789 798
790sub smooth_update { 799sub smooth_update {
791 my ($self, $facenum, $face) = @_; 800 my ($self, $facenum, $face) = @_;
792 801
793 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 802 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
794} 803}
795 804
796sub set_texture { 805sub have_tile {
797 my ($self, $id, $data) = @_; 806 my ($self, $tile) = @_;
798 807
799 return unless $self->{map}; 808 return unless $self->{map};
800 809
801 $self->{texture}[$id] = my $tex = 810 my $tex = $self->{texture}[$tile] ||=
802 new_from_image CFPlus::Texture 811 new CFPlus::Texture
803 $data, minify => 1, mipmap => 1; 812 tile => $tile, minify => 1, mipmap => 1, delay => 1;
804 813
805 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
806 $self->{map_widget}->update;
807
808 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 814 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
809} 815}
810 816
811sub connect_face_update { 817sub connect_face_update {
812 my ($self, $id, $cb) = @_; 818 my ($self, $id, $cb) = @_;
813 819
… …
1008 } 1014 }
1009 1015
1010 $::FLOORBOX->add_at (@add); 1016 $::FLOORBOX->add_at (@add);
1011 }); 1017 });
1012 1018
1013 $::WANT_REFRESH++; 1019 $::WANT_REFRESH->start;
1014} 1020}
1015 1021
1016sub set_opencont { 1022sub set_opencont {
1017 my ($conn, $tag, $name) = @_; 1023 my ($conn, $tag, $name) = @_;
1018 $conn->{open_container} = $tag; 1024 $conn->{open_container} = $tag;

Diff Legend

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