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.142 by root, Tue Jul 31 00:50:04 2007 UTC

… …
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (music => sub { 53 $self->connect_ext (music => sub {
54 my ($ev) = @_; 54 my ($ev) = @_;
55 55
56 &::audio_music_set ($self->{songs} = $ev->{play}) 56 &::audio_music_set_ambient ($self->{songs} = $ev->{ambient})
57 if $ev->{play}; 57 if $ev->{ambient};
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 });
… …
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 }); 190 });
189 191
190 # message window 192 # message window
191 $self->connect_ext (channel_info => sub { 193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
192 $::MESSAGE_WINDOW->add_channel ($_[0]); 196 $::MESSAGE_WINDOW->add_channel ($info);
193 }); 197 });
194 198
195 # destroy widgets on logout 199 # destroy widgets on logout
196 $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 {
197 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
731 735
732 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
733 737
734 } elsif ($face->{type} & 1) { # with metadata 738 } 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." }); 739 #::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; 740 CFPlus::DB::get res_meta => $face->{name}, $cb;
737 } 741 }
738} 742}
739 743
740sub face_update { 744sub face_update {
741 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
… …
754 $self->{music_meta}{$facenum} = $face; 758 $self->{music_meta}{$facenum} = $face;
755 759
756 ::message ({ markup => "downloaded song #$facenum" }) 760 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed; 761 if $changed;
758 762
759 &::audio_music_set ($self->{songs}); 763 &::audio_music_set_ambient ($self->{songs});
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);
760 }; 773 };
761 } 774 }
762 775
763 if ($changed) { # new data 776 if ($changed) { # new data
764 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
765 my $path = CFPlus::DB::path_of_res $face->{name};
766 778
767 CFPlus::DB::write_file $path, $data, sub { 779 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
768 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
769 $face->{meta} = $self->{json_coder}->decode ($meta_json); 781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
770 $face->{path} = $path;
771
772 $cb->(); 782 $cb->();
773 };
774 }; 783 };
784
775 } else { 785 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
777 $cb->(); 787 $cb->();
778 } 788 }
779 } 789 }
… …
811 @{$self->{face_cb}{$id}}; 821 @{$self->{face_cb}{$id}};
812 } 822 }
813} 823}
814 824
815sub sound_play { 825sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
817 827
818 $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
819} 830}
820 831
821my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
822 833
823sub query { 834sub query {
… …
888 $self->{$type} = $text; 899 $self->{$type} = $text;
889 } else { 900 } else {
890 $self->logprint ("msg: ", $text); 901 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 902 return if $color < 0; # negative color == ignore if not understood
892 903
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
894 905
895 ## 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
896 # no longer neecssary with TRT servers 907 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 908 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 909
899 ::message ({ fg => $fg, markup => $_, type => $type }) 910 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
900 for split /\n/, $text; 911 for split /\n/, $text;
901 912
902 $self->{statusbox}->add ($text, 913 $self->{statusbox}->add ($text,
903 group => $text, 914 group => $text,
904 fg => $fg, 915 fg => $fg,
… …
959 my ($self) = @_; 970 my ($self) = @_;
960 971
961 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
962 973
963 ::stop_game (); 974 ::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} 975}
999 976
1000sub update_floorbox { 977sub update_floorbox {
1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1002 return unless $::CONN; 979 return unless $::CONN;
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1140 );
1164 1141
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1142}
1167 1143
1168sub logged_in { 1144sub logged_in {
1169 my ($self) = @_; 1145 my ($self) = @_;
1170 1146
… …
1190 1166
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1167 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1168 $self->send_command ("output-count $::CFG->{output_count}");
1193 $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;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $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} 1171}
1204 1172
1205sub lookat { 1173sub lookat {
1206 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
1207 1175

Diff Legend

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