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.114 by root, Thu Jul 12 18:28:34 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 my $pri = -100;
63 for my $face (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) {
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 resmap => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, $pri, undef, sub {
79 my $num = $_[0];
80 my $len = length $_[1];
81 my ($meta, $data) = unpack "(w/a*)*", $_[1];
82
83 CFPlus::DB::write_file $chksum, $data, sub { };
84 CFPlus::DB::put resmap => $chksum => $meta, sub { };
85
86 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
87 ::message ({ markup => "downloaded song #$face, size $len octets" });
88
89 &::audio_music_set ($self->{songs});
90 });
91 }
92 }
93 }
94
95 push @songs, $self->{music_map}{$face};
96 --$pri;
97 }
98
99 &::audio_music_set ($self->{songs} = \@songs);
100 });
101
53 $self->connect_ext (event_capabilities => sub { 102 $self->connect_ext (event_capabilities => sub {
54 my ($cap) = @_; 103 my ($cap) = @_;
55 104
56 if (my $ts = $cap->{tileset}) { 105 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 106 if (my ($default) = grep $_->[2] & 1, @$ts) {
64 113
65 $self->setup_req (mapsize => "${w}x${h}"); 114 $self->setup_req (mapsize => "${w}x${h}");
66 } 115 }
67 } 116 }
68 }); 117 });
118
119 $self->{json_coder}
120 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub {
122 $self->{widget}{$_[0]}
123 });
69 124
70 $self->connect_ext (ws_n => sub { 125 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_; 126 my ($arg) = @_;
72 127
73 $self->{widgetset}{$arg{id}} = { 128 $self->{widgetset}{$arg{id}} = {
129 184
130 my $w = $self->{widget}{$arg->{id}} 185 my $w = $self->{widget}{$arg->{id}}
131 or return; 186 or return;
132 my $m = $arg->{name}; 187 my $m = $arg->{name};
133 188
134 my @a = map {
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] }; 189 my $a = $arg->{args} || [];
139 190
140 if (exists $arg->{rid}) { 191 if (exists $arg->{rid}) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
142 } else { 193 } else {
143 $w->$m (@a); 194 $w->$m (@$a);
144 } 195 }
145 }); 196 });
146 197
147 $self->connect_ext (w_s => sub { 198 $self->connect_ext (w_s => sub {
148 my ($arg) = @_; 199 my ($arg) = @_;
1130 1181
1131 (delete $self->{npc_dialog})->destroy 1182 (delete $self->{npc_dialog})->destroy
1132 if $self->{npc_dialog}; 1183 if $self->{npc_dialog};
1133 1184
1134 $self->SUPER::destroy; 1185 $self->SUPER::destroy;
1186
1187 %$self = ();
1135} 1188}
1136 1189
1137package CFPlus::NPCDialog; 1190package CFPlus::NPCDialog;
1138 1191
1139our @ISA = 'CFPlus::UI::Toplevel'; 1192our @ISA = 'CFPlus::UI::Toplevel';

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines