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.131 by root, Tue Jul 24 04:54:48 2007 UTC vs.
Revision 1.139 by root, Sun Jul 29 18:22:34 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 });
… …
183 185
184 my $w = $self->{widget}{$id} 186 my $w = $self->{widget}{$id}
185 or return; 187 or return;
186 188
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
190 });
191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
188 }); 197 });
189 198
190 # destroy widgets on logout 199 # destroy widgets on logout
191 $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 {
192 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
734 743
735sub face_update { 744sub face_update {
736 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
737 746
738 if ($face->{type} == 0) { # FT_FACE 747 if ($face->{type} == 0) { # FT_FACE
739 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
740 if $changed; 749 if $changed;
741 750
742 $self->set_texture ($face->{id} => delete $face->{data}); 751 $self->set_texture ($face->{id} => delete $face->{data});
743 752
744 } elsif ($face->{type} & 1) { # split metadata 753 } elsif ($face->{type} & 1) { # split metadata
745 my $cb = sub { }; 754 my $cb = sub { };
755 my $path;
746 756
747 if ($face->{type} == 3) { # FT_MUSIC 757 if ($face->{type} == 3) { # FT_MUSIC
758 # store externally
759 $path = CFPlus::DB::path_of_res $face->{name};
760
748 $cb = sub { 761 $cb = sub {
749 $self->{music_meta}{$facenum} = $face; 762 $self->{music_meta}{$facenum} = $face;
750 763
751 ::message ({ markup => "downloaded song #$facenum" }) 764 ::message ({ markup => "downloaded song #$facenum" })
752 if $changed; 765 if $changed;
753 766
754 &::audio_music_set ($self->{songs}); 767 &::audio_music_set ($self->{songs});
755 }; 768 };
769 } elsif ($face->{type} == 5) { # FT_SOUND
770 $cb = sub {
771 $self->{sound_meta}{$facenum} = $face;
772
773 use Data::Dumper; warn Dumper $face;#d#
774 ::message ({ markup => "downloaded sound #$facenum" })
775 if $changed;
756 } 776 };
777 }
778
757 779
758 if ($changed) { # new data 780 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 781 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760 my $path = CFPlus::DB::path_of_res $face->{name};
761 782
762 CFPlus::DB::write_file $path, $data, sub { 783 my $put_cb = sub {
763 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 784 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764 $face->{meta} = $self->{json_coder}->decode ($meta_json); 785 $face->{meta} = $self->{json_coder}->decode ($meta_json);
765 $face->{path} = $path; 786 $face->{path} = $path;
766 787
767 $cb->(); 788 $cb->();
768 }; 789 };
769 }; 790 };
791
792 if (defined $path) {
793 CFPlus::DB::write_file $path, $data, $put_cb;
794 } else {
795 CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb;
796 }
770 } else { 797 } else {
771 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 798 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
799 $face->{path} = $path;
772 $cb->(); 800 $cb->();
773 } 801 }
774 } 802 }
775} 803}
776 804
… …
807 } 835 }
808} 836}
809 837
810sub sound_play { 838sub sound_play {
811 my ($self, $x, $y, $soundnum, $type) = @_; 839 my ($self, $x, $y, $soundnum, $type) = @_;
840 warn "sound play <@_>\n";#d#
812 841
813 $self->{sound_play}->($x, $y, $soundnum, $type); 842 #$self->{sound_play}->($x, $y, $soundnum, $type);
814} 843}
815 844
816my $LAST_QUERY; # server is stupid, stupid, stupid 845my $LAST_QUERY; # server is stupid, stupid, stupid
817 846
818sub query { 847sub query {
… …
883 $self->{$type} = $text; 912 $self->{$type} = $text;
884 } else { 913 } else {
885 $self->logprint ("msg: ", $text); 914 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood 915 return if $color < 0; # negative color == ignore if not understood
887 916
888 my $fg = $CF_COLOR[$color % @CF_COLOR]; 917 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
889 918
890 ## try to create single paragraphs of multiple lines sent by the server 919 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers 920 # no longer neecssary with TRT servers
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 921 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
893 922
894 ::message ({ fg => $fg, markup => $_ }) 923 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
895 for split /\n/, $text; 924 for split /\n/, $text;
896 925
897 $self->{statusbox}->add ($text, 926 $self->{statusbox}->add ($text,
898 group => $text, 927 group => $text,
899 fg => $fg, 928 fg => $fg,
… …
954 my ($self) = @_; 983 my ($self) = @_;
955 984
956 $self->{map_widget}->clr_commands; 985 $self->{map_widget}->clr_commands;
957 986
958 ::stop_game (); 987 ::stop_game ();
959}
960
961sub image_info {
962 my ($self, $numfaces) = @_;
963
964 $self->{num_faces} = $numfaces;
965 $self->{face_prefetch} = [1 .. $numfaces];
966 $self->face_prefetch;
967}
968
969sub face_prefetch {
970 my ($self) = @_;
971
972 return unless $::CFG->{face_prefetch};
973
974 if ($self->{num_faces}) {
975 return if @{ $self->{send_queue} || [] };
976 my $todo = @{ $self->{face_prefetch} }
977 or return;
978
979 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981 $self->send ("requestinfo image_sums $face $face");
982
983 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985 } elsif (!exists $self->{num_faces}) {
986 $self->send ("requestinfo image_info");
987
988 $self->{num_faces} = 0;
989
990 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 }
993} 988}
994 989
995sub update_floorbox { 990sub update_floorbox {
996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 991 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997 return unless $::CONN; 992 return unless $::CONN;
… …
1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1150 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1151 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157 . "map size $self->{mapw}×$self->{maph}\n" 1152 . "map size $self->{mapw}×$self->{maph}\n"
1158 ); 1153 );
1159 1154
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
1161} 1155}
1162 1156
1163sub logged_in { 1157sub logged_in {
1164 my ($self) = @_; 1158 my ($self) = @_;
1165 1159
… …
1185 1179
1186 $self->send_command ("output-sync $::CFG->{output_sync}"); 1180 $self->send_command ("output-sync $::CFG->{output_sync}");
1187 $self->send_command ("output-count $::CFG->{output_count}"); 1181 $self->send_command ("output-count $::CFG->{output_count}");
1188 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1182 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1189 $self->send_command ("pickup $::CFG->{pickup}"); 1183 $self->send_command ("pickup $::CFG->{pickup}");
1190}
1191
1192sub buildat {
1193 my ($self, $builditem, $x, $y) = @_;
1194
1195 if ($self->{cfplus_ext}) {
1196 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1197 }
1198} 1184}
1199 1185
1200sub lookat { 1186sub lookat {
1201 my ($self, $x, $y) = @_; 1187 my ($self, $x, $y) = @_;
1202 1188

Diff Legend

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