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.133 by elmex, Tue Jul 24 18:39:39 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 });
… …
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 }); 188 });
189 189
190 # message window 190 # message window
191 $self->connect_ext (channel_info => sub { 191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
192 $::MESSAGE_WINDOW->add_channel ($_[0]); 194 $::MESSAGE_WINDOW->add_channel ($info);
193 }); 195 });
194 196
195 # destroy widgets on logout 197 # destroy widgets on logout
196 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
197 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
224} 226}
225 227
226sub logprint { 228sub logprint {
227 my ($self, @a) = @_; 229 my ($self, @a) = @_;
228 230
229 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
230 my $path = "$Crossfire::VARDIR/log.$self->{host}";
231
232 open my $fh, ">>:utf8", $path
233 or die "Couldn't open logfile $path: $!";
234
235 $fh->autoflush (1);
236
237 $fh;
238 };
239
240 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
241
242 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
243 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
244
245 print {$self->{log_fh}} "$ts ", @a, "\n";
246} 232}
247 233
248sub _stat_numdiff { 234sub _stat_numdiff {
249 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
250 236
… …
558 do { 544 do {
559 $id = pop @{$self->{bg_fetch}} 545 $id = pop @{$self->{bg_fetch}}
560 or return; 546 or return;
561 } while $self->{texture}[$id]; 547 } while $self->{texture}[$id];
562 548
563 CFPlus::DB::get tilecache => $id, sub { 549 CFPlus::DB::exists tilecache => $id, sub {
564 my ($data) = @_; 550 my ($exists) = @_;
565 551
566 return unless $self->{map}; # stop when destroyed 552 return unless $self->{map}; # stop when destroyed
567 553
568 $self->set_texture ($id => $data) 554 $self->have_tile ($id)
569 if defined $data; 555 if $exists;
570 556
571 $self->bg_fetch; 557 $self->bg_fetch;
572 }; 558 };
573} 559}
574 560
… …
731 717
732 CFPlus::DB::get tilecache => $id, $cb; 718 CFPlus::DB::get tilecache => $id, $cb;
733 719
734 } elsif ($face->{type} & 1) { # with metadata 720 } elsif ($face->{type} & 1) { # with metadata
735 #::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." });
736 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 722 CFPlus::DB::get res_meta => $face->{name}, $cb;
737 } 723 }
738} 724}
739 725
740sub face_update { 726sub face_update {
741 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
742 728
743 if ($face->{type} == 0) { # FT_FACE 729 if ($face->{type} == 0) { # FT_FACE
744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
745 if $changed; 731 if $changed;
746 732
747 $self->set_texture ($face->{id} => delete $face->{data}); 733 $self->have_tile ($face->{id});
748 734
749 } elsif ($face->{type} & 1) { # split metadata 735 } elsif ($face->{type} & 1) { # split metadata
750 my $cb = sub { }; 736 my $cb = sub { };
751 737
752 if ($face->{type} == 3) { # FT_MUSIC 738 if ($face->{type} == 3) { # FT_MUSIC
… …
754 $self->{music_meta}{$facenum} = $face; 740 $self->{music_meta}{$facenum} = $face;
755 741
756 ::message ({ markup => "downloaded song #$facenum" }) 742 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed; 743 if $changed;
758 744
759 &::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);
760 }; 755 };
761 } 756 }
762 757
763 if ($changed) { # new data 758 if ($changed) { # new data
764 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
765 my $path = CFPlus::DB::path_of_res $face->{name};
766 760
767 CFPlus::DB::write_file $path, $data, sub { 761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
768 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
769 $face->{meta} = $self->{json_coder}->decode ($meta_json); 763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
770 $face->{path} = $path; 764 ::add_license ($face);
771
772 $cb->(); 765 $cb->();
773 };
774 }; 766 };
767
775 } else { 768 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
777 $cb->(); 771 $cb->();
778 } 772 }
779 } 773 }
780} 774}
781 775
… …
783 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
784 778
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
786} 780}
787 781
788sub set_texture { 782sub have_tile {
789 my ($self, $id, $data) = @_; 783 my ($self, $tile) = @_;
790 784
791 return unless $self->{map}; 785 return unless $self->{map};
792 786
793 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$tile] ||= my $tex =
794 new_from_image CFPlus::Texture 788 new CFPlus::Texture
795 $data, minify => 1, mipmap => 1; 789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
796 790
797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
798 $self->{map_widget}->update;
799
800 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
801} 792}
802 793
803sub connect_face_update { 794sub connect_face_update {
804 my ($self, $id, $cb) = @_; 795 my ($self, $id, $cb) = @_;
805 796
… …
811 @{$self->{face_cb}{$id}}; 802 @{$self->{face_cb}{$id}};
812 } 803 }
813} 804}
814 805
815sub sound_play { 806sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
817 808
818 $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
819} 811}
820 812
821my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
822 814
823sub query { 815sub query {
… …
888 $self->{$type} = $text; 880 $self->{$type} = $text;
889 } else { 881 } else {
890 $self->logprint ("msg: ", $text); 882 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 883 return if $color < 0; # negative color == ignore if not understood
892 884
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
894 886
895 ## 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
896 # no longer neecssary with TRT servers 888 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 890
899 ::message ({ fg => $fg, markup => $_, type => $type }) 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
900 for split /\n/, $text; 892 for split /\n/, $text;
901 893
902 $self->{statusbox}->add ($text, 894 $self->{statusbox}->add ($text,
903 group => $text, 895 group => $text,
904 fg => $fg, 896 fg => $fg,
… …
959 my ($self) = @_; 951 my ($self) = @_;
960 952
961 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
962 954
963 ::stop_game (); 955 ::stop_game ();
964}
965
966sub image_info {
967 my ($self, $numfaces) = @_;
968
969 $self->{num_faces} = $numfaces;
970 $self->{face_prefetch} = [1 .. $numfaces];
971 $self->face_prefetch;
972}
973
974sub face_prefetch {
975 my ($self) = @_;
976
977 return unless $::CFG->{face_prefetch};
978
979 if ($self->{num_faces}) {
980 return if @{ $self->{send_queue} || [] };
981 my $todo = @{ $self->{face_prefetch} }
982 or return;
983
984 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
985
986 $self->send ("requestinfo image_sums $face $face");
987
988 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
989 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
990 } elsif (!exists $self->{num_faces}) {
991 $self->send ("requestinfo image_info");
992
993 $self->{num_faces} = 0;
994
995 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
996 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
997 }
998} 956}
999 957
1000sub update_floorbox { 958sub update_floorbox {
1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1002 return unless $::CONN; 960 return unless $::CONN;
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1121 );
1164 1122
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1123}
1167 1124
1168sub logged_in { 1125sub logged_in {
1169 my ($self) = @_; 1126 my ($self) = @_;
1170 1127
… …
1190 1147
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1148 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
1195}
1196
1197sub buildat {
1198 my ($self, $builditem, $x, $y) = @_;
1199
1200 if ($self->{cfplus_ext}) {
1201 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1202 }
1203} 1152}
1204 1153
1205sub lookat { 1154sub lookat {
1206 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
1207 1156

Diff Legend

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