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.141 by root, Sun Jul 29 21:31:47 2007 UTC

… …
57 if $ev->{play}; 57 if $ev->{play};
58 }); 58 });
59 59
60 $self->connect_ext (capabilities => sub { 60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_; 61 my (%cap) = @_;
62
63 #$self->send ("setup sound 0"); # we use a different protocol
62 64
63 $self->send_exti_msg (fx_want => { 65 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND 67 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 }); 68 });
… …
189 191
190 # message window 192 # message window
191 $self->connect_ext (channel_info => sub { 193 $self->connect_ext (channel_info => sub {
192 my ($info) = @_; 194 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info; 195 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($_[0]); 196 $::MESSAGE_WINDOW->add_channel ($info);
195 }); 197 });
196 198
197 # destroy widgets on logout 199 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
733 735
734 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
735 737
736 } elsif ($face->{type} & 1) { # with metadata 738 } 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." }); 739 #::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; 740 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 } 741 }
740} 742}
741 743
742sub face_update { 744sub face_update {
743 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
… …
758 ::message ({ markup => "downloaded song #$facenum" }) 760 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed; 761 if $changed;
760 762
761 &::audio_music_set ($self->{songs}); 763 &::audio_music_set ($self->{songs});
762 }; 764 };
765 } elsif ($face->{type} == 5) { # FT_SOUND
766 $cb = sub {
767 $self->{sound_meta}{$facenum} = $face;
768
769 ::message ({ markup => "downloaded sound #$facenum" })
770 if $changed;
771
772 &::audio_sound_push ($facenum);
773 };
763 } 774 }
764 775
765 if ($changed) { # new data 776 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768 778
769 CFPlus::DB::write_file $path, $data, sub { 779 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json); 781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773
774 $cb->(); 782 $cb->();
775 };
776 }; 783 };
784
777 } else { 785 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779 $cb->(); 787 $cb->();
780 } 788 }
781 } 789 }
… …
813 @{$self->{face_cb}{$id}}; 821 @{$self->{face_cb}{$id}};
814 } 822 }
815} 823}
816 824
817sub sound_play { 825sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
819 827
820 $self->{sound_play}->($x, $y, $soundnum, $type); 828 &::audio_sound_play ($face, $dx, $dy, $vol)
829 unless $type & 1; # odd types are silent for future expansion
821} 830}
822 831
823my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
824 833
825sub query { 834sub query {
… …
890 $self->{$type} = $text; 899 $self->{$type} = $text;
891 } else { 900 } else {
892 $self->logprint ("msg: ", $text); 901 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 902 return if $color < 0; # negative color == ignore if not understood
894 903
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
896 905
897 ## try to create single paragraphs of multiple lines sent by the server 906 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers 907 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 908 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 909
901 ::message ({ fg => $fg, markup => $_, type => $type }) 910 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
902 for split /\n/, $text; 911 for split /\n/, $text;
903 912
904 $self->{statusbox}->add ($text, 913 $self->{statusbox}->add ($text,
905 group => $text, 914 group => $text,
906 fg => $fg, 915 fg => $fg,
… …
961 my ($self) = @_; 970 my ($self) = @_;
962 971
963 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
964 973
965 ::stop_game (); 974 ::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} 975}
1001 976
1002sub update_floorbox { 977sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 979 return unless $::CONN;
… …
1162 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1163 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1164 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
1165 ); 1140 );
1166 1141
1167 ::setup_build_button ($self->{editor_support}->{builder_ui});
1168} 1142}
1169 1143
1170sub logged_in { 1144sub logged_in {
1171 my ($self) = @_; 1145 my ($self) = @_;
1172 1146
… …
1192 1166
1193 $self->send_command ("output-sync $::CFG->{output_sync}"); 1167 $self->send_command ("output-sync $::CFG->{output_sync}");
1194 $self->send_command ("output-count $::CFG->{output_count}"); 1168 $self->send_command ("output-count $::CFG->{output_count}");
1195 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1169 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1196 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $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} 1171}
1206 1172
1207sub lookat { 1173sub lookat {
1208 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
1209 1175

Diff Legend

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