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.140 by root, Sun Jul 29 18:56:02 2007 UTC vs.
Revision 1.150 by root, Sun Aug 12 09:39:36 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 ("setup sound 0"); # we use a different protocol 61 #$self->send ("setup sound 0"); # we use a different protocol
64 62 $self->update_fx_want;
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
69 63
70 if (my $ts = $cap{tileset}) { 64 if (my $ts = $cap{tileset}) {
71 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
72 $self->{tileset} = $default; 66 $self->{tileset} = $default;
73 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
… …
225 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
226 220
227 $self 221 $self
228} 222}
229 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
230sub logprint { 233sub logprint {
231 my ($self, @a) = @_; 234 my ($self, @a) = @_;
232 235
233 $self->{log_fh} ||= do { 236 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} 237}
251 238
252sub _stat_numdiff { 239sub _stat_numdiff {
253 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
254 241
… …
519} 506}
520 507
521sub feed_map1a { 508sub feed_map1a {
522 my ($self, $data) = @_; 509 my ($self, $data) = @_;
523 510
524 $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 {
525 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
526} 541}
527 542
528sub magicmap { 543sub magicmap {
529 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
530 545
… …
562 do { 577 do {
563 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
564 or return; 579 or return;
565 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
566 581
567 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
568 my ($data) = @_; 583 my ($exists) = @_;
569 584
570 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
571 586
572 $self->set_texture ($id => $data) 587 if ($exists) {
573 if defined $data; 588 $self->have_tile ($id)
589 $self->{texture}[$id]->upload;
590 }
574 591
575 $self->bg_fetch; 592 $self->bg_fetch;
576 }; 593 };
577} 594}
578 595
… …
734 $self->{map}->set_tileid ($facenum => $id); 751 $self->{map}->set_tileid ($facenum => $id);
735 752
736 CFPlus::DB::get tilecache => $id, $cb; 753 CFPlus::DB::get tilecache => $id, $cb;
737 754
738 } elsif ($face->{type} & 1) { # with metadata 755 } 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." });
740 CFPlus::DB::get res_meta => $face->{name}, $cb; 756 CFPlus::DB::get res_meta => $face->{name}, $cb;
741 } 757 }
742} 758}
743 759
744sub face_update { 760sub face_update {
… …
746 762
747 if ($face->{type} == 0) { # FT_FACE 763 if ($face->{type} == 0) { # FT_FACE
748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
749 if $changed; 765 if $changed;
750 766
751 $self->set_texture ($face->{id} => delete $face->{data}); 767 $self->have_tile ($face->{id});
752 768
753 } elsif ($face->{type} & 1) { # split metadata 769 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { };
755
756 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set ($self->{songs});
764 };
765 } elsif ($face->{type} == 5) { # FT_SOUND
766 $cb = sub {
767 $self->{sound_meta}{$facenum} = $face;
768
769 use Data::Dumper; warn Dumper $face;#d#
770 ::message ({ markup => "downloaded sound #$facenum" })
771 if $changed;
772 };
773 }
774
775
776 if ($changed) { # new data 770 if ($changed) { # new data
777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
772 $face->{meta} = $self->{json_coder}->decode ($meta_json);
778 773
779 CFPlus::DB::put res_data => $face->{name} => $data, sub { 774 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
782
783 $cb->();
784 };
785 };
786
787 } else { 776 } else {
788 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
789 $cb->();
790 } 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
791 } 798 }
792} 799}
793 800
794sub smooth_update { 801sub smooth_update {
795 my ($self, $facenum, $face) = @_; 802 my ($self, $facenum, $face) = @_;
796 803
797 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
798} 805}
799 806
800sub set_texture { 807sub have_tile {
801 my ($self, $id, $data) = @_; 808 my ($self, $tile) = @_;
802 809
803 return unless $self->{map}; 810 return unless $self->{map};
804 811
805 $self->{texture}[$id] = my $tex = 812 my $tex = $self->{texture}[$tile] ||=
806 new_from_image CFPlus::Texture 813 new CFPlus::Texture
807 $data, minify => 1, mipmap => 1; 814 tile => $tile, minify => 1, mipmap => 1, delay => 1;
808 815
809 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
810 $self->{map_widget}->update;
811
812 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
813} 817}
814 818
815sub connect_face_update { 819sub connect_face_update {
816 my ($self, $id, $cb) = @_; 820 my ($self, $id, $cb) = @_;
817 821
… …
823 @{$self->{face_cb}{$id}}; 827 @{$self->{face_cb}{$id}};
824 } 828 }
825} 829}
826 830
827sub sound_play { 831sub sound_play {
828 my ($self, $x, $y, $soundnum, $type) = @_; 832 my ($self, $type, $face, $dx, $dy, $vol) = @_;
829 warn "sound play <@_>\n";#d#
830 833
831 #$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
832} 836}
833 837
834my $LAST_QUERY; # server is stupid, stupid, stupid 838my $LAST_QUERY; # server is stupid, stupid, stupid
835 839
836sub query { 840sub query {
… …
1012 } 1016 }
1013 1017
1014 $::FLOORBOX->add_at (@add); 1018 $::FLOORBOX->add_at (@add);
1015 }); 1019 });
1016 1020
1017 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
1018} 1022}
1019 1023
1020sub set_opencont { 1024sub set_opencont {
1021 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
1022 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;

Diff Legend

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