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.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.123 by root, Thu Jul 19 16:44:14 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 xwidget => 1, 26 ywidget => 1,
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;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
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 (event_music => sub {
54 my ($ev) = @_;
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]);
104 }
105 });
106
53 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
54 my ($cap) = @_; 108 my ($cap) = @_;
55 109
56 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
… …
65 $self->setup_req (mapsize => "${w}x${h}"); 119 $self->setup_req (mapsize => "${w}x${h}");
66 } 120 }
67 } 121 }
68 }); 122 });
69 123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
70 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_; 132 my ($arg) = @_;
72 133
73 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
74 w => {}, 135 w => {},
75 }; 136 };
76 }); 137 });
77 138
139 # widgetset destroy
78 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_; 141 my ($arg) = @_;
80 142
81 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
82 or return; 144 or return;
83 145
84 $_->destroy 146 $_->destroy
85 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
86 }); 148 });
87 149
150 # widgetset destroy
88 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_; 152 my ($arg) = @_;
90 153
91 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
92 155
… …
122 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";
123 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
124 } 187 }
125 }); 188 });
126 189
190 # widget call
127 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
128 my ($arg) = @_; 192 my ($arg) = @_;
129 193
130 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
131 or return; 195 or return;
132 my $m = $arg->{name}; 196 my $m = $arg->{name};
133 197
134 my @a = map {
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] }; 198 my $a = $arg->{args} || [];
139 199
140 if (exists $arg->{rid}) { 200 if (exists $arg->{rid}) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
142 } else { 202 } else {
143 $w->$m (@a); 203 $w->$m (@$a);
144 } 204 }
145 }); 205 });
146 206
207 # widget set
147 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
148 my ($arg) = @_; 209 my ($arg) = @_;
149 210
150 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
151 or return; 212 or return;
152 213
153 $w->{$arg->{name}} = $arg->{value}; 214 $w->{$arg->{name}} = $arg->{value};
154 }); 215 });
155 216
217 # widget get
156 $self->connect_ext (w_g => sub { 218 $self->connect_ext (w_g => sub {
157 my ($arg) = @_; 219 my ($arg) = @_;
158 220
159 my $w = $self->{widget}{$arg->{id}} 221 my $w = $self->{widget}{$arg->{id}}
160 or return; 222 or return;
161 223
162 $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}}]);
163 }); 225 });
164 226
227 # destroy widgets on logout
165 $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 {
166 for my $ws (values %{delete $self->{widgetset} || {}}) { 229 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy 230 $_->destroy
168 for values %{delete $ws->{w} || {}}; 231 for values %{delete $ws->{w} || {}};
169 } 232 }
… …
710} 773}
711 774
712sub set_texture { 775sub set_texture {
713 my ($self, $id, $data) = @_; 776 my ($self, $id, $data) = @_;
714 777
778 return unless $self->{map};
779
715 $self->{texture}[$id] = my $tex = 780 $self->{texture}[$id] = my $tex =
716 new_from_image CFPlus::Texture 781 new_from_image CFPlus::Texture
717 $data, minify => 1, mipmap => 1; 782 $data, minify => 1, mipmap => 1;
718 783
719 $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}});
720 $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 }
721} 800}
722 801
723sub sound_play { 802sub sound_play {
724 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $x, $y, $soundnum, $type) = @_;
725 804
… …
1130 1209
1131 (delete $self->{npc_dialog})->destroy 1210 (delete $self->{npc_dialog})->destroy
1132 if $self->{npc_dialog}; 1211 if $self->{npc_dialog};
1133 1212
1134 $self->SUPER::destroy; 1213 $self->SUPER::destroy;
1214
1215 %$self = ();
1135} 1216}
1136 1217
1137package CFPlus::NPCDialog; 1218package CFPlus::NPCDialog;
1138 1219
1139our @ISA = 'CFPlus::UI::Toplevel'; 1220our @ISA = 'CFPlus::UI::Toplevel';

Diff Legend

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