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.130 by root, Tue Jul 24 00:28:07 2007 UTC vs.
Revision 1.136 by elmex, Fri Jul 27 18:04:42 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1, 26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
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 (music => sub {
54 my (%ev) = @_; 54 my ($ev) = @_;
55 55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 56 &::audio_music_set ($self->{songs} = $ev->{play})
104 } 57 if $ev->{play};
105 }); 58 });
106 59
107 $self->connect_ext (capabilities => sub { 60 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_; 61 my (%cap) = @_;
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
109 67
110 if (my $ts = $cap{tileset}) { 68 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 70 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
… …
225 183
226 my $w = $self->{widget}{$id} 184 my $w = $self->{widget}{$id}
227 or return; 185 or return;
228 186
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
230 }); 195 });
231 196
232 # destroy widgets on logout 197 # destroy widgets on logout
233 $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 {
234 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
756} 721}
757 722
758sub face_find { 723sub face_find {
759 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
760 725
761 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
762
763 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
764 728
765 $face->{id} = $id; 729 $face->{id} = $id;
766 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
767 731
768 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
769 733
770 CFPlus::DB::get tilecache => $id, $cb; 734 CFPlus::DB::get tilecache => $id, $cb;
735
736 } 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." });
738 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
739 }
771} 740}
772 741
773sub face_update { 742sub face_update {
774 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
775 744
745 if ($face->{type} == 0) { # FT_FACE
776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
777 if $changed; 747 if $changed;
778 748
779 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } 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
766 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);
772 $face->{path} = $path;
773
774 $cb->();
775 };
776 };
777 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779 $cb->();
780 }
781 }
780} 782}
781 783
782sub smooth_update { 784sub smooth_update {
783 my ($self, $facenum, $face) = @_; 785 my ($self, $facenum, $face) = @_;
784 786
… …
894 896
895 ## try to create single paragraphs of multiple lines sent by the server 897 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers 898 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 899 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 900
899 ::message ({ fg => $fg, markup => $_ }) 901 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
900 for split /\n/, $text; 902 for split /\n/, $text;
901 903
902 $self->{statusbox}->add ($text, 904 $self->{statusbox}->add ($text,
903 group => $text, 905 group => $text,
904 fg => $fg, 906 fg => $fg,
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1162 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1163 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1164 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1165 );
1164 1166
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1167}
1167 1168
1168sub logged_in { 1169sub logged_in {
1169 my ($self) = @_; 1170 my ($self) = @_;
1170 1171
… …
1190 1191
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1192 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1193 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1194 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1195 $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} 1196}
1204 1197
1205sub lookat { 1198sub lookat {
1206 my ($self, $x, $y) = @_; 1199 my ($self, $x, $y) = @_;
1207 1200

Diff Legend

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