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.134 by elmex, Wed Jul 25 15:06:19 2007 UTC vs.
Revision 1.147 by root, Thu Aug 9 03:40:01 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];
… …
189 185
190 # message window 186 # message window
191 $self->connect_ext (channel_info => sub { 187 $self->connect_ext (channel_info => sub {
192 my ($info) = @_; 188 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info; 189 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($_[0]); 190 $::MESSAGE_WINDOW->add_channel ($info);
195 }); 191 });
196 192
197 # destroy widgets on logout 193 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
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
… …
560 do { 549 do {
561 $id = pop @{$self->{bg_fetch}} 550 $id = pop @{$self->{bg_fetch}}
562 or return; 551 or return;
563 } while $self->{texture}[$id]; 552 } while $self->{texture}[$id];
564 553
565 CFPlus::DB::get tilecache => $id, sub { 554 CFPlus::DB::exists tilecache => $id, sub {
566 my ($data) = @_; 555 my ($exists) = @_;
567 556
568 return unless $self->{map}; # stop when destroyed 557 return unless $self->{map}; # stop when destroyed
569 558
570 $self->set_texture ($id => $data) 559 $self->have_tile ($id)
571 if defined $data; 560 if $exists;
572 561
573 $self->bg_fetch; 562 $self->bg_fetch;
574 }; 563 };
575} 564}
576 565
… …
733 722
734 CFPlus::DB::get tilecache => $id, $cb; 723 CFPlus::DB::get tilecache => $id, $cb;
735 724
736 } elsif ($face->{type} & 1) { # with metadata 725 } 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." }); 726 #::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; 727 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 } 728 }
740} 729}
741 730
742sub face_update { 731sub face_update {
743 my ($self, $facenum, $face, $changed) = @_; 732 my ($self, $facenum, $face, $changed) = @_;
744 733
745 if ($face->{type} == 0) { # FT_FACE 734 if ($face->{type} == 0) { # FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 735 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 736 if $changed;
748 737
749 $self->set_texture ($face->{id} => delete $face->{data}); 738 $self->have_tile ($face->{id});
750 739
751 } elsif ($face->{type} & 1) { # split metadata 740 } 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 741 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 742 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); 743 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773 744
774 $cb->(); 745 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775 }; 746 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
776 };
777 } else { 747 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 748 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779 $cb->();
780 } 749 }
750
751 ::add_license ($face);
752
753 if ($face->{type} == 3) { # FT_MUSIC
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_push ($facenum);
760 } elsif ($face->{type} == 5) { # FT_SOUND
761 $self->{sound_meta}{$facenum} = $face;
762
763 ::message ({ markup => "downloaded sound #$facenum" })
764 if $changed;
765
766 &::audio_sound_push ($facenum);
767 }
768
781 } 769 }
782} 770}
783 771
784sub smooth_update { 772sub smooth_update {
785 my ($self, $facenum, $face) = @_; 773 my ($self, $facenum, $face) = @_;
786 774
787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 775 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
788} 776}
789 777
790sub set_texture { 778sub have_tile {
791 my ($self, $id, $data) = @_; 779 my ($self, $tile) = @_;
792 780
793 return unless $self->{map}; 781 return unless $self->{map};
794 782
795 $self->{texture}[$id] = my $tex = 783 $self->{texture}[$tile] ||= my $tex =
796 new_from_image CFPlus::Texture 784 new CFPlus::Texture
797 $data, minify => 1, mipmap => 1; 785 tile => $tile, minify => 1, mipmap => 1, delay => 1;
798 786
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}) || []}; 787 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
803} 788}
804 789
805sub connect_face_update { 790sub connect_face_update {
806 my ($self, $id, $cb) = @_; 791 my ($self, $id, $cb) = @_;
807 792
… …
813 @{$self->{face_cb}{$id}}; 798 @{$self->{face_cb}{$id}};
814 } 799 }
815} 800}
816 801
817sub sound_play { 802sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $type, $face, $dx, $dy, $vol) = @_;
819 804
820 $self->{sound_play}->($x, $y, $soundnum, $type); 805 &::audio_sound_play ($face, $dx, $dy, $vol)
806 unless $type & 1; # odd types are silent for future expansion
821} 807}
822 808
823my $LAST_QUERY; # server is stupid, stupid, stupid 809my $LAST_QUERY; # server is stupid, stupid, stupid
824 810
825sub query { 811sub query {
… …
890 $self->{$type} = $text; 876 $self->{$type} = $text;
891 } else { 877 } else {
892 $self->logprint ("msg: ", $text); 878 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 879 return if $color < 0; # negative color == ignore if not understood
894 880
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 881 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
896 882
897 ## try to create single paragraphs of multiple lines sent by the server 883 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers 884 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 885 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 886
901 ::message ({ fg => $fg, markup => $_, type => $type }) 887 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
902 for split /\n/, $text; 888 for split /\n/, $text;
903 889
904 $self->{statusbox}->add ($text, 890 $self->{statusbox}->add ($text,
905 group => $text, 891 group => $text,
906 fg => $fg, 892 fg => $fg,
… …
961 my ($self) = @_; 947 my ($self) = @_;
962 948
963 $self->{map_widget}->clr_commands; 949 $self->{map_widget}->clr_commands;
964 950
965 ::stop_game (); 951 ::stop_game ();
966}
967
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} 952}
1001 953
1002sub update_floorbox { 954sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 955 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 956 return unless $::CONN;
… …
1162 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1163 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1164 . "map size $self->{mapw}×$self->{maph}\n" 1116 . "map size $self->{mapw}×$self->{maph}\n"
1165 ); 1117 );
1166 1118
1167 ::setup_build_button ($self->{editor_support}->{builder_ui});
1168} 1119}
1169 1120
1170sub logged_in { 1121sub logged_in {
1171 my ($self) = @_; 1122 my ($self) = @_;
1172 1123
… …
1192 1143
1193 $self->send_command ("output-sync $::CFG->{output_sync}"); 1144 $self->send_command ("output-sync $::CFG->{output_sync}");
1194 $self->send_command ("output-count $::CFG->{output_count}"); 1145 $self->send_command ("output-count $::CFG->{output_count}");
1195 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1146 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1196 $self->send_command ("pickup $::CFG->{pickup}"); 1147 $self->send_command ("pickup $::CFG->{pickup}");
1197}
1198
1199sub buildat {
1200 my ($self, $builditem, $x, $y) = @_;
1201
1202 if ($self->{cfplus_ext}) {
1203 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1204 }
1205} 1148}
1206 1149
1207sub lookat { 1150sub lookat {
1208 my ($self, $x, $y) = @_; 1151 my ($self, $x, $y) = @_;
1209 1152

Diff Legend

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