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.119 by root, Sat Jul 14 12:05:53 2007 UTC vs.
Revision 1.123 by root, Thu Jul 19 16:44:14 2007 UTC

… …
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 # check if already cached 70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta_json) { 75 if (defined $meta_json) {
75 my $meta = $self->{json_coder}->decode ($meta_json); 76 my $meta = $self->{json_coder}->decode ($meta_json);
76 $meta->{path} = CFPlus::DB::path_of_res $chksum; 77 $meta->{path} = $path;
77 $self->{music_meta}{$chksum} = $meta; 78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
78 } else { 80 } else {
79 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
80 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
81 my $len = length $_[1]; 83 my $len = length $_[1];
82 my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
83 85
84 my $meta = $self->{json_coder}->decode ($meta_json);
85 $meta->{path} = CFPlus::DB::path_of_res $chksum;
86 $self->{music_meta}{$chksum} = $meta;
87
88 CFPlus::DB::write_file $meta->{path}, $data, sub { }; 86 CFPlus::DB::write_file $path, $data, sub {
89 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, 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;
90 91
91 ::message ({ markup => "downloaded song #$face, size $len octets" }); 92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
92 }); 96 });
93 } 97 }
94
95 &::audio_music_set ($self->{songs});
96 } 98 }
97 } 99 }
98 } 100 }
99 101
100 if (my $play = $ev->{play}) { 102 if (my $play = $ev->{play}) {
… …
123 ->convert_blessed 125 ->convert_blessed
124 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
125 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
126 }); 128 });
127 129
130 # widgetset new
128 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
129 my ($arg) = @_; 132 my ($arg) = @_;
130 133
131 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
132 w => {}, 135 w => {},
133 }; 136 };
134 }); 137 });
135 138
139 # widgetset destroy
136 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
137 my ($arg) = @_; 141 my ($arg) = @_;
138 142
139 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
140 or return; 144 or return;
141 145
142 $_->destroy 146 $_->destroy
143 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
144 }); 148 });
145 149
150 # widgetset destroy
146 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
147 my ($arg) = @_; 152 my ($arg) = @_;
148 153
149 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
150 155
… …
180 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
181 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
182 } 187 }
183 }); 188 });
184 189
190 # widget call
185 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
186 my ($arg) = @_; 192 my ($arg) = @_;
187 193
188 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
189 or return; 195 or return;
… …
196 } else { 202 } else {
197 $w->$m (@$a); 203 $w->$m (@$a);
198 } 204 }
199 }); 205 });
200 206
207 # widget set
201 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
202 my ($arg) = @_; 209 my ($arg) = @_;
203 210
204 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
205 or return; 212 or return;
206 213
207 $w->{$arg->{name}} = $arg->{value}; 214 $w->{$arg->{name}} = $arg->{value};
208 }); 215 });
209 216
217 # widget get
210 $self->connect_ext (w_g => sub { 218 $self->connect_ext (w_g => sub {
211 my ($arg) = @_; 219 my ($arg) = @_;
212 220
213 my $w = $self->{widget}{$arg->{id}} 221 my $w = $self->{widget}{$arg->{id}}
214 or return; 222 or return;
215 223
216 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
217 }); 225 });
218 226
227 # destroy widgets on logout
219 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
220 for my $ws (values %{delete $self->{widgetset} || {}}) { 229 for my $ws (values %{delete $self->{widgetset} || {}}) {
221 $_->destroy 230 $_->destroy
222 for values %{delete $ws->{w} || {}}; 231 for values %{delete $ws->{w} || {}};
223 } 232 }
… …
772 new_from_image CFPlus::Texture 781 new_from_image CFPlus::Texture
773 $data, minify => 1, mipmap => 1; 782 $data, minify => 1, mipmap => 1;
774 783
775 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 784 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
776 $self->{map_widget}->update; 785 $self->{map_widget}->update;
786
787 $_->() for @{(delete $self->{face_cb}{$id}) || []};
788}
789
790sub connect_face_update {
791 my ($self, $id, $cb) = @_;
792
793 push @{$self->{face_cb}{$id}}, $cb;
794
795 CFPlus::guard {
796 @{$self->{face_cb}{$id}}
797 = grep $_ != $cb,
798 @{$self->{face_cb}{$id}};
799 }
777} 800}
778 801
779sub sound_play { 802sub sound_play {
780 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $x, $y, $soundnum, $type) = @_;
781 804

Diff Legend

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