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.142 by root, Tue Jul 31 00:50:04 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
56 &::audio_music_set_ambient ($self->{songs} = $ev->{ambient}) 55 &::audio_music_set_ambient ($songs);
57 if $ev->{ambient};
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
230sub logprint { 228sub 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
252sub _stat_numdiff { 234sub _stat_numdiff {
253 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
254 236
… …
562 do { 544 do {
563 $id = pop @{$self->{bg_fetch}} 545 $id = pop @{$self->{bg_fetch}}
564 or return; 546 or return;
565 } while $self->{texture}[$id]; 547 } while $self->{texture}[$id];
566 548
567 CFPlus::DB::get tilecache => $id, sub { 549 CFPlus::DB::exists tilecache => $id, sub {
568 my ($data) = @_; 550 my ($exists) = @_;
569 551
570 return unless $self->{map}; # stop when destroyed 552 return unless $self->{map}; # stop when destroyed
571 553
572 $self->set_texture ($id => $data) 554 $self->have_tile ($id)
573 if defined $data; 555 if $exists;
574 556
575 $self->bg_fetch; 557 $self->bg_fetch;
576 }; 558 };
577} 559}
578 560
… …
746 728
747 if ($face->{type} == 0) { # FT_FACE 729 if ($face->{type} == 0) { # FT_FACE
748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
749 if $changed; 731 if $changed;
750 732
751 $self->set_texture ($face->{id} => delete $face->{data}); 733 $self->have_tile ($face->{id});
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 737
756 if ($face->{type} == 3) { # FT_MUSIC 738 if ($face->{type} == 3) { # FT_MUSIC
… …
758 $self->{music_meta}{$facenum} = $face; 740 $self->{music_meta}{$facenum} = $face;
759 741
760 ::message ({ markup => "downloaded song #$facenum" }) 742 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed; 743 if $changed;
762 744
763 &::audio_music_set_ambient ($self->{songs}); 745 &::audio_music_push ($facenum);
764 }; 746 };
765 } elsif ($face->{type} == 5) { # FT_SOUND 747 } elsif ($face->{type} == 5) { # FT_SOUND
766 $cb = sub { 748 $cb = sub {
767 $self->{sound_meta}{$facenum} = $face; 749 $self->{sound_meta}{$facenum} = $face;
768 750
… …
777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
778 760
779 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
781 $face->{meta} = $self->{json_coder}->decode ($meta_json); 763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
782 $cb->(); 765 $cb->();
783 }; 766 };
784 767
785 } else { 768 } else {
786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
787 $cb->(); 771 $cb->();
788 } 772 }
789 } 773 }
790} 774}
791 775
… …
793 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
794 778
795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
796} 780}
797 781
798sub set_texture { 782sub have_tile {
799 my ($self, $id, $data) = @_; 783 my ($self, $tile) = @_;
800 784
801 return unless $self->{map}; 785 return unless $self->{map};
802 786
803 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$tile] ||= my $tex =
804 new_from_image CFPlus::Texture 788 new CFPlus::Texture
805 $data, minify => 1, mipmap => 1; 789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
806 790
807 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
808 $self->{map_widget}->update;
809
810 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
811} 792}
812 793
813sub connect_face_update { 794sub connect_face_update {
814 my ($self, $id, $cb) = @_; 795 my ($self, $id, $cb) = @_;
815 796

Diff Legend

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