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.117 by root, Fri Jul 13 05:31:31 2007 UTC vs.
Revision 1.123 by root, Thu Jul 19 16:44:14 2007 UTC

… …
67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
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) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta) { 75 if (defined $meta_json) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 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});
76 } else { 80 } else {
77 ::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." });
78 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1]; 83 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
81 85
82 CFPlus::DB::write_file $chksum, $data, sub { }; 86 CFPlus::DB::write_file $path, $data, sub {
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { }; 87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
86 ::message ({ markup => "downloaded song #$face, size $len octets" }); 92 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs}); 93 &::audio_music_set ($self->{songs});
94 };
95 };
89 }); 96 });
90 } 97 }
91 } 98 }
92 } 99 }
93 } 100 }
… …
118 ->convert_blessed 125 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
121 }); 128 });
122 129
130 # widgetset new
123 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_; 132 my ($arg) = @_;
125 133
126 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
127 w => {}, 135 w => {},
128 }; 136 };
129 }); 137 });
130 138
139 # widgetset destroy
131 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_; 141 my ($arg) = @_;
133 142
134 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return; 144 or return;
136 145
137 $_->destroy 146 $_->destroy
138 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
139 }); 148 });
140 149
150 # widgetset destroy
141 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_; 152 my ($arg) = @_;
143 153
144 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
145 155
… …
175 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";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 } 187 }
178 }); 188 });
179 189
190 # widget call
180 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
181 my ($arg) = @_; 192 my ($arg) = @_;
182 193
183 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
184 or return; 195 or return;
… …
191 } else { 202 } else {
192 $w->$m (@$a); 203 $w->$m (@$a);
193 } 204 }
194 }); 205 });
195 206
207 # widget set
196 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
197 my ($arg) = @_; 209 my ($arg) = @_;
198 210
199 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
200 or return; 212 or return;
201 213
202 $w->{$arg->{name}} = $arg->{value}; 214 $w->{$arg->{name}} = $arg->{value};
203 }); 215 });
204 216
217 # widget get
205 $self->connect_ext (w_g => sub { 218 $self->connect_ext (w_g => sub {
206 my ($arg) = @_; 219 my ($arg) = @_;
207 220
208 my $w = $self->{widget}{$arg->{id}} 221 my $w = $self->{widget}{$arg->{id}}
209 or return; 222 or return;
210 223
211 $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}}]);
212 }); 225 });
213 226
227 # destroy widgets on logout
214 $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 {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 229 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 230 $_->destroy
217 for values %{delete $ws->{w} || {}}; 231 for values %{delete $ws->{w} || {}};
218 } 232 }
… …
759} 773}
760 774
761sub set_texture { 775sub set_texture {
762 my ($self, $id, $data) = @_; 776 my ($self, $id, $data) = @_;
763 777
778 return unless $self->{map};
779
764 $self->{texture}[$id] = my $tex = 780 $self->{texture}[$id] = my $tex =
765 new_from_image CFPlus::Texture 781 new_from_image CFPlus::Texture
766 $data, minify => 1, mipmap => 1; 782 $data, minify => 1, mipmap => 1;
767 783
768 $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}});
769 $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 }
770} 800}
771 801
772sub sound_play { 802sub sound_play {
773 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $x, $y, $soundnum, $type) = @_;
774 804

Diff Legend

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