1 | package CFClient::Protocol; |
1 | package CFPlus::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Crossfire::Protocol::Constants; |
7 | |
7 | |
8 | use CFClient; |
8 | use CFPlus; |
|
|
9 | use CFPlus::DB; |
9 | use CFClient::UI; |
10 | use CFPlus::UI; |
|
|
11 | use CFPlus::Pod; |
|
|
12 | use CFPlus::Macro; |
|
|
13 | use CFPlus::Item; |
|
|
14 | |
|
|
15 | use Crossfire::Protocol::Base 0.95; |
10 | |
16 | |
11 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Crossfire::Protocol::Base'; |
12 | |
18 | |
13 | sub new { |
19 | sub new { |
14 | my $class = shift; |
20 | my ($class, %arg) = @_; |
15 | |
21 | |
16 | my $self = $class->SUPER::new (@_); |
22 | my $self = $class->SUPER::new (%arg, |
|
|
23 | setup_req => { |
|
|
24 | extmap => 1, |
|
|
25 | excmd => 1, |
|
|
26 | ywidget => 1, |
|
|
27 | %{$arg{setup_req} || {}}, |
|
|
28 | }, |
|
|
29 | ); |
17 | |
30 | |
18 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
19 | |
32 | |
20 | my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { |
33 | my @cmd_help = map { |
21 | my ($pom) = @_; |
|
|
22 | |
|
|
23 | my @cmd_help; |
|
|
24 | |
|
|
25 | for my $head2 ($pom->head1->[-2]->head2) { |
|
|
26 | $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
27 | or next; |
35 | or die "unparseable command help: $_->{kw}[0]"; |
28 | |
36 | |
29 | my $cmd = $1; |
37 | my $cmd = $1; |
30 | my @args = split /\|/, $2; |
38 | my @args = split /\|/, $2; |
31 | @args = (".*") unless @args; |
39 | @args = (".*") unless @args; |
32 | |
40 | |
|
|
41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
|
|
42 | my $text = CFPlus::Pod::as_label @par; |
|
|
43 | |
33 | $_ = $_ eq ".*" ? "" : " $_" |
44 | $_ = $_ eq ".*" ? "" : " $_" |
34 | for @args; |
45 | for @args; |
35 | |
46 | |
36 | my $text = CFClient::pod_to_pango $head2->content; |
47 | map ["$cmd$_", $text], |
37 | |
|
|
38 | push @cmd_help, ["$cmd$_", $text] |
|
|
39 | for sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
40 | @args; |
49 | @args |
|
|
50 | } sort { $a->{par} <=> $b->{par} } |
|
|
51 | CFPlus::Pod::find command => "*"; |
|
|
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 | ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." }); |
|
|
71 | $self->ask_face ($face, $pri, undef, sub { |
|
|
72 | my $num = $_[0]; |
|
|
73 | my $len = length $_[1]; |
|
|
74 | my ($meta, $data) = unpack "(w/a*)*", $_[1]; |
|
|
75 | |
|
|
76 | CFPlus::DB::write_file $chksum, $data, sub { }; |
|
|
77 | CFPlus::DB::put resmap => $chksum => $meta, sub { }; |
|
|
78 | |
|
|
79 | $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); |
|
|
80 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
|
|
81 | |
|
|
82 | &::audio_music_set ($self->{songs}); |
|
|
83 | }); |
|
|
84 | } |
|
|
85 | |
|
|
86 | push @songs, $self->{music_map}{$face}; |
|
|
87 | --$pri; |
41 | } |
88 | } |
42 | |
89 | |
43 | \@cmd_help |
90 | &::audio_music_set ($self->{songs} = \@songs); |
44 | }; |
91 | }); |
|
|
92 | |
|
|
93 | $self->connect_ext (event_capabilities => sub { |
|
|
94 | my ($cap) = @_; |
|
|
95 | |
|
|
96 | if (my $ts = $cap->{tileset}) { |
|
|
97 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
98 | $self->{tileset} = $default; |
|
|
99 | $self->{tilesize} = $default->[3]; |
|
|
100 | $self->setup_req (tileset => $default->[0]); |
|
|
101 | |
|
|
102 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
103 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
104 | |
|
|
105 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
106 | } |
|
|
107 | } |
|
|
108 | }); |
|
|
109 | |
|
|
110 | $self->{json_coder} |
|
|
111 | ->convert_blessed |
|
|
112 | ->filter_json_single_key_object (__widget_ref__ => sub { |
|
|
113 | $self->{widget}{$_[0]} |
|
|
114 | }); |
|
|
115 | |
|
|
116 | $self->connect_ext (ws_n => sub { |
|
|
117 | my ($arg) = @_; |
|
|
118 | |
|
|
119 | $self->{widgetset}{$arg{id}} = { |
|
|
120 | w => {}, |
|
|
121 | }; |
|
|
122 | }); |
|
|
123 | |
|
|
124 | $self->connect_ext (ws_d => sub { |
|
|
125 | my ($arg) = @_; |
|
|
126 | |
|
|
127 | my $ws = delete $self->{widgetset}{$arg{id}} |
|
|
128 | or return; |
|
|
129 | |
|
|
130 | $_->destroy |
|
|
131 | for values %{$ws->{w}}; |
|
|
132 | }); |
|
|
133 | |
|
|
134 | $self->connect_ext (ws_c => sub { |
|
|
135 | my ($arg) = @_; |
|
|
136 | |
|
|
137 | my $args = $arg->{args} || {}; |
|
|
138 | |
|
|
139 | for my $ev (grep /^on_/, keys %$args) { |
|
|
140 | $args->{$ev} = sub { |
|
|
141 | my $id = shift->{s_id}; |
|
|
142 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
|
|
143 | |
|
|
144 | 1 |
|
|
145 | }; |
|
|
146 | } |
|
|
147 | |
|
|
148 | if (my $widget = eval { |
|
|
149 | local $SIG{__DIE__}; |
|
|
150 | "CFPlus::UI::$arg->{class}"->new ( |
|
|
151 | %$args, |
|
|
152 | s_ws => $arg->{ws}, |
|
|
153 | s_id => $arg->{id}, |
|
|
154 | ) |
|
|
155 | } |
|
|
156 | ) { |
|
|
157 | $self->{widget}{$arg->{id}} |
|
|
158 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
|
|
159 | = $widget; |
|
|
160 | |
|
|
161 | $widget->connect (on_destroy => sub { |
|
|
162 | my ($widget) = @_; |
|
|
163 | |
|
|
164 | delete $self->{widget}{$widget->{s_id}}; |
|
|
165 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
166 | }); |
|
|
167 | } else { |
|
|
168 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
|
|
169 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
170 | } |
|
|
171 | }); |
|
|
172 | |
|
|
173 | $self->connect_ext (w_c => sub { |
|
|
174 | my ($arg) = @_; |
|
|
175 | |
|
|
176 | my $w = $self->{widget}{$arg->{id}} |
|
|
177 | or return; |
|
|
178 | my $m = $arg->{name}; |
|
|
179 | |
|
|
180 | my $a = $arg->{args} || []; |
|
|
181 | |
|
|
182 | if (exists $arg->{rid}) { |
|
|
183 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); |
|
|
184 | } else { |
|
|
185 | $w->$m (@$a); |
|
|
186 | } |
|
|
187 | }); |
|
|
188 | |
|
|
189 | $self->connect_ext (w_s => sub { |
|
|
190 | my ($arg) = @_; |
|
|
191 | |
|
|
192 | my $w = $self->{widget}{$arg->{id}} |
|
|
193 | or return; |
|
|
194 | |
|
|
195 | $w->{$arg->{name}} = $arg->{value}; |
|
|
196 | }); |
|
|
197 | |
|
|
198 | $self->connect_ext (w_g => sub { |
|
|
199 | my ($arg) = @_; |
|
|
200 | |
|
|
201 | my $w = $self->{widget}{$arg->{id}} |
|
|
202 | or return; |
|
|
203 | |
|
|
204 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
|
|
205 | }); |
|
|
206 | |
|
|
207 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
208 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
209 | $_->destroy |
|
|
210 | for values %{delete $ws->{w} || {}}; |
|
|
211 | } |
|
|
212 | }); |
45 | |
213 | |
46 | $self->{map_widget}->add_command (@$_) |
214 | $self->{map_widget}->add_command (@$_) |
47 | for @$cmd_help; |
215 | for @cmd_help; |
48 | |
216 | |
|
|
217 | { |
|
|
218 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
|
|
219 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
220 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
221 | } |
|
|
222 | |
|
|
223 | { |
49 | $self->{noface} = new_from_file CFClient::Texture |
224 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
50 | CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; |
225 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
226 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
227 | } |
51 | |
228 | |
52 | $self->{open_container} = 0; |
229 | $self->{open_container} = 0; |
53 | |
230 | |
54 | # "global" |
|
|
55 | $self->{tilecache} = CFClient::db_table "tilecache"; |
|
|
56 | $self->{facemap} = CFClient::db_table "facemap"; |
|
|
57 | |
|
|
58 | # per server |
231 | # per server |
59 | $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; |
232 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
60 | |
233 | |
61 | $self |
234 | $self |
62 | } |
235 | } |
63 | |
236 | |
64 | sub logprint { |
237 | sub logprint { |
… | |
… | |
221 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
394 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
222 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
395 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
223 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
396 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
224 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
397 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
225 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
398 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
226 | my $rng = $stats->{+CS_STAT_RANGE}; |
399 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
227 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
228 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
229 | my $title = $stats->{+CS_STAT_TITLE}; |
400 | my $title = $stats->{+CS_STAT_TITLE}; |
230 | $title =~ s/^Player: //; |
401 | $title =~ s/^Player: //; |
231 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
402 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
232 | |
403 | |
233 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
404 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
242 | $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); |
413 | $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); |
243 | $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); |
414 | $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); |
244 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
415 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
245 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
416 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
246 | |
417 | |
247 | $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); |
418 | $self->update_weight; |
248 | |
419 | |
249 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) |
420 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) |
250 | for keys %RES_TBL; |
421 | for keys %RES_TBL; |
251 | |
422 | |
252 | my $sktbl = $::STATWIDS->{skill_tbl}; |
423 | my $sktbl = $::STATWIDS->{skill_tbl}; |
253 | my @skills = keys %{ $self->{skill_info} }; |
424 | my @skills = keys %{ $self->{skill_info} }; |
254 | |
425 | |
255 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
426 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
256 | $sktbl->clear; |
427 | $sktbl->clear; |
257 | |
428 | |
258 | $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); |
429 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
259 | $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); |
430 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
260 | $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); |
431 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
261 | $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); |
432 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
262 | $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); |
433 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
263 | $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); |
434 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
264 | |
435 | |
|
|
436 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
|
|
437 | |
|
|
438 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
|
|
439 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
|
|
440 | |
265 | my ($x, $y) = (1, 0); |
441 | my ($x, $y) = (0, 1); |
266 | for ( |
442 | for ( |
267 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
443 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
268 | map [$_, $self->{skill_info}{$_}], |
444 | map [$_, $self->{skill_info}{$_}], |
269 | grep exists $stats->{$_}, |
445 | grep exists $stats->{$_}, |
270 | @skills |
446 | @skills |
271 | ) { |
447 | ) { |
272 | my ($idx, $name) = @$_; |
448 | my ($idx, $name) = @$_; |
273 | |
449 | |
|
|
450 | my $spell_cb = sub { |
|
|
451 | my ($widget, $ev) = @_; |
|
|
452 | |
|
|
453 | if ($ev->{button} == 1) { |
|
|
454 | $::CONN->user_send ("ready_skill $name"); |
|
|
455 | } elsif ($ev->{button} == 2) { |
|
|
456 | $::CONN->user_send ("use_skill $name"); |
|
|
457 | } elsif ($ev->{button} == 3) { |
|
|
458 | my $shortname = CFPlus::shorten $name, 14; |
|
|
459 | (new CFPlus::UI::Menu |
|
|
460 | items => [ |
|
|
461 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
|
|
462 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
|
|
463 | ], |
|
|
464 | )->popup ($ev); |
|
|
465 | } else { |
|
|
466 | return 0; |
|
|
467 | } |
|
|
468 | |
|
|
469 | 1 |
|
|
470 | }; |
|
|
471 | |
274 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label |
472 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
275 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); |
473 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
276 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label |
474 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
277 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); |
475 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
278 | $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); |
476 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
477 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
279 | |
478 | |
280 | $x++ and ($x, $y) = (0, $y + 1); |
479 | $x++ and ($x, $y) = (0, $y + 1); |
281 | } |
480 | } |
282 | } |
481 | } |
283 | |
482 | |
… | |
… | |
285 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
484 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
286 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
485 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
287 | } |
486 | } |
288 | } |
487 | } |
289 | |
488 | |
|
|
489 | sub macro_send { |
|
|
490 | my ($self, $macro) = @_; |
|
|
491 | |
|
|
492 | for my $cmd (@{ $macro->{action} }) { |
|
|
493 | $self->send_command ($cmd); |
|
|
494 | } |
|
|
495 | } |
|
|
496 | |
290 | sub user_send { |
497 | sub user_send { |
291 | my ($self, $command) = @_; |
498 | my ($self, $command) = @_; |
292 | |
499 | |
|
|
500 | $self->{record}->($command) |
293 | if ($self->{record}) { |
501 | if $self->{record}; |
294 | push @{$self->{record}}, $command; |
|
|
295 | } |
|
|
296 | |
502 | |
297 | $self->logprint ("send: ", $command); |
503 | $self->logprint ("send: ", $command); |
298 | $self->send_command ($command); |
504 | $self->send_command ($command); |
299 | ::status ($command); |
505 | ::status ($command); |
300 | } |
506 | } |
301 | |
507 | |
302 | sub start_record { |
508 | sub record { |
303 | my ($self) = @_; |
509 | my ($self, $cb) = @_; |
304 | |
510 | |
305 | $self->{record} = []; |
511 | $self->{record} = $cb; |
306 | } |
|
|
307 | |
|
|
308 | sub stop_record { |
|
|
309 | my ($self) = @_; |
|
|
310 | return delete $self->{record}; |
|
|
311 | } |
512 | } |
312 | |
513 | |
313 | sub map_scroll { |
514 | sub map_scroll { |
314 | my ($self, $dx, $dy) = @_; |
515 | my ($self, $dx, $dy) = @_; |
315 | |
516 | |
… | |
… | |
317 | } |
518 | } |
318 | |
519 | |
319 | sub feed_map1a { |
520 | sub feed_map1a { |
320 | my ($self, $data) = @_; |
521 | my ($self, $data) = @_; |
321 | |
522 | |
322 | $self->{map}->map1a_update ($data); |
523 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
323 | $self->{map_widget}->update; |
524 | $self->{map_widget}->update; |
324 | } |
525 | } |
325 | |
526 | |
326 | sub magicmap { |
527 | sub magicmap { |
327 | my ($self, $w, $h, $x, $y, $data) = @_; |
528 | my ($self, $w, $h, $x, $y, $data) = @_; |
… | |
… | |
336 | or return; |
537 | or return; |
337 | |
538 | |
338 | my ($hash, $x, $y, $w, $h) = @$map_info; |
539 | my ($hash, $x, $y, $w, $h) = @$map_info; |
339 | |
540 | |
340 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
541 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
341 | $self->{mapcache}->put ($hash => Compress::LZF::compress $data); |
542 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
342 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
543 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
343 | } |
544 | } |
344 | |
545 | |
345 | sub map_clear { |
546 | sub map_clear { |
346 | my ($self) = @_; |
547 | my ($self) = @_; |
… | |
… | |
350 | |
551 | |
351 | $self->{map}->clear; |
552 | $self->{map}->clear; |
352 | delete $self->{map_widget}{magicmap}; |
553 | delete $self->{map_widget}{magicmap}; |
353 | } |
554 | } |
354 | |
555 | |
|
|
556 | sub bg_fetch { |
|
|
557 | my ($self) = @_; |
|
|
558 | |
|
|
559 | my $id; |
|
|
560 | |
|
|
561 | do { |
|
|
562 | $id = pop @{$self->{bg_fetch}} |
|
|
563 | or return; |
|
|
564 | } while $self->{texture}[$id]; |
|
|
565 | |
|
|
566 | CFPlus::DB::get tilecache => $id, sub { |
|
|
567 | my ($data) = @_; |
|
|
568 | |
|
|
569 | return unless $self->{map}; # stop when destroyed |
|
|
570 | |
|
|
571 | $self->set_texture ($id => $data) |
|
|
572 | if defined $data; |
|
|
573 | |
|
|
574 | $self->bg_fetch; |
|
|
575 | }; |
|
|
576 | } |
355 | |
577 | |
356 | sub load_map($$$) { |
578 | sub load_map($$$) { |
357 | my ($self, $hash, $x, $y) = @_; |
579 | my ($self, $hash, $x, $y) = @_; |
358 | |
580 | |
359 | if (defined (my $data = $self->{mapcache}->get ($hash))) { |
581 | my $gen = $self->{map_change_gen}; |
|
|
582 | |
|
|
583 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
584 | return unless $gen == $self->{map_change_gen}; |
|
|
585 | |
|
|
586 | my ($data) = @_; |
|
|
587 | |
|
|
588 | if (defined $data) { |
360 | $data = Compress::LZF::decompress $data; |
589 | $data = Compress::LZF::decompress $data; |
361 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
590 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
362 | for my $id ($self->{map}->set_rect ($x, $y, $data)) { |
|
|
363 | my $data = $self->{tilecache}->get ($id) |
|
|
364 | or next; |
|
|
365 | |
591 | |
366 | $self->set_texture ($id => $data); |
592 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
|
|
593 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
|
|
594 | $self->bg_fetch unless $inprogress; |
367 | } |
595 | } |
368 | } |
596 | }; |
369 | } |
597 | } |
370 | |
598 | |
371 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
599 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
372 | # (server resource,s latency, bandwidth), so this hack is warranted. |
600 | # (server resource,s latency, bandwidth), so this hack is warranted. |
373 | # the right fix is to make real tiled maps with an overview file |
601 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
437 | |
665 | |
438 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
666 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
439 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
667 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
440 | |
668 | |
441 | } else { |
669 | } else { |
|
|
670 | my $gen = $self->{map_change_gen}; |
442 | $self->send_mapinfo ("spatial $path$tile", sub { |
671 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
672 | return unless $gen == $self->{map_change_gen}; |
|
|
673 | |
443 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
674 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
444 | |
675 | |
445 | return if $mode ne "spatial"; |
676 | return if $mode ne "spatial"; |
446 | |
677 | |
447 | $x += $self->{map}->ox; |
678 | $x += $self->{map}->ox; |
… | |
… | |
461 | |
692 | |
462 | sub map_change { |
693 | sub map_change { |
463 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
694 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
464 | |
695 | |
465 | $self->flush_map; |
696 | $self->flush_map; |
|
|
697 | |
|
|
698 | ++$self->{map_change_gen}; |
466 | |
699 | |
467 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
700 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
468 | |
701 | |
469 | my $mapmapw = $self->{mapmap}->{w}; |
702 | my $mapmapw = $self->{mapmap}->{w}; |
470 | my $mapmaph = $self->{mapmap}->{h}; |
703 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
487 | $self->load_map ($hash, $x, $y); |
720 | $self->load_map ($hash, $x, $y); |
488 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
721 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
489 | } |
722 | } |
490 | |
723 | |
491 | sub face_find { |
724 | sub face_find { |
492 | my ($self, $facenum, $face) = @_; |
725 | my ($self, $facenum, $face, $cb) = @_; |
493 | |
726 | |
494 | my $hash = "$face->{chksum},$face->{name}"; |
727 | my $hash = "$face->{chksum},$face->{name}"; |
495 | |
728 | |
496 | my $id = $self->{facemap}->get ($hash); |
729 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
497 | |
730 | |
498 | unless ($id) { |
|
|
499 | # create new id for face |
|
|
500 | # I love transactions |
|
|
501 | for (1..100) { |
|
|
502 | my $txn = $CFClient::DB_ENV->txn_begin; |
|
|
503 | my $status = $self->{facemap}->db_get (id => $id); |
|
|
504 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
|
|
505 | $id = ($id || 64) + 1; |
|
|
506 | if ($self->{facemap}->put (id => $id) == 0 |
|
|
507 | && $self->{facemap}->put ($hash => $id) == 0) { |
|
|
508 | $txn->txn_commit; |
|
|
509 | |
|
|
510 | goto gotid; |
|
|
511 | } |
|
|
512 | } |
|
|
513 | $txn->txn_abort; |
|
|
514 | } |
|
|
515 | |
|
|
516 | CFClient::fatal "maximum number of transaction retries reached - database problems?"; |
|
|
517 | } |
|
|
518 | |
|
|
519 | gotid: |
|
|
520 | $face->{id} = $id; |
731 | $face->{id} = $id; |
521 | $self->{map}->set_face ($facenum => $id); |
|
|
522 | $self->{faceid}[$facenum] = $id;#d# |
732 | $self->{faceid}[$facenum] = $id; |
523 | |
733 | |
524 | my $face = $self->{tilecache}->get ($id); |
734 | $self->{map}->set_tileid ($facenum => $id); |
525 | |
735 | |
526 | if ($face) { |
736 | CFPlus::DB::get tilecache => $id, $cb; |
527 | #$self->face_prefetch; |
|
|
528 | $face |
|
|
529 | } else { |
|
|
530 | my $tex = $self->{noface}; |
|
|
531 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
532 | undef |
|
|
533 | }; |
|
|
534 | } |
737 | } |
535 | |
738 | |
536 | sub face_update { |
739 | sub face_update { |
537 | my ($self, $facenum, $face, $changed) = @_; |
740 | my ($self, $facenum, $face, $changed) = @_; |
538 | |
741 | |
539 | $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; |
742 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
|
|
743 | if $changed; |
540 | |
744 | |
541 | $self->set_texture ($face->{id} => delete $face->{image}); |
745 | $self->set_texture ($face->{id} => delete $face->{image}); |
|
|
746 | } |
|
|
747 | |
|
|
748 | sub smooth_update { |
|
|
749 | my ($self, $facenum, $face) = @_; |
|
|
750 | |
|
|
751 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
542 | } |
752 | } |
543 | |
753 | |
544 | sub set_texture { |
754 | sub set_texture { |
545 | my ($self, $id, $data) = @_; |
755 | my ($self, $id, $data) = @_; |
546 | |
756 | |
547 | $self->{texture}[$id] ||= do { |
757 | $self->{texture}[$id] = my $tex = |
548 | my $tex = |
|
|
549 | new_from_image CFClient::Texture |
758 | new_from_image CFPlus::Texture |
550 | $data, minify => 1, mipmap => 1; |
759 | $data, minify => 1, mipmap => 1; |
551 | |
760 | |
552 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
761 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
553 | $self->{map_widget}->update; |
762 | $self->{map_widget}->update; |
554 | |
|
|
555 | $tex |
|
|
556 | }; |
|
|
557 | } |
763 | } |
558 | |
764 | |
559 | sub sound_play { |
765 | sub sound_play { |
560 | my ($self, $x, $y, $soundnum, $type) = @_; |
766 | my ($self, $x, $y, $soundnum, $type) = @_; |
561 | |
767 | |
… | |
… | |
571 | $LAST_QUERY = $prompt; |
777 | $LAST_QUERY = $prompt; |
572 | |
778 | |
573 | $self->{query}-> ($self, $flags, $prompt); |
779 | $self->{query}-> ($self, $flags, $prompt); |
574 | } |
780 | } |
575 | |
781 | |
576 | sub drawinfo { |
782 | sub sanitise_xml($) { |
577 | my ($self, $color, $text) = @_; |
783 | local $_ = shift; |
578 | |
784 | |
579 | my @color = ( |
785 | # we now weed out all tags we do not support |
|
|
786 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
787 | # now all entities |
|
|
788 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
789 | |
|
|
790 | # handle some elements |
|
|
791 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
792 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
793 | |
|
|
794 | $_ |
|
|
795 | } |
|
|
796 | |
|
|
797 | our %NAME_TO_COLOR = ( |
|
|
798 | black => 0, |
|
|
799 | white => 1, |
|
|
800 | darkblue => 2, |
|
|
801 | red => 3, |
|
|
802 | orange => 4, |
|
|
803 | lightblue => 5, |
|
|
804 | darkorange => 6, |
|
|
805 | green => 7, |
|
|
806 | darkgreen => 8, |
|
|
807 | grey => 9, |
|
|
808 | brown => 10, |
|
|
809 | yellow => 11, |
|
|
810 | tan => 12, |
|
|
811 | ); |
|
|
812 | |
|
|
813 | our @CF_COLOR = ( |
580 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
814 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
581 | [1.00, 1.00, 1.00], |
815 | [1.00, 1.00, 1.00], |
582 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
816 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
583 | [1.00, 0.00, 0.00], |
817 | [1.00, 0.00, 0.00], |
584 | [1.00, 0.54, 0.00], |
818 | [1.00, 0.54, 0.00], |
585 | [0.11, 0.56, 1.00], |
819 | [0.11, 0.56, 1.00], |
586 | [0.93, 0.46, 0.00], |
820 | [0.93, 0.46, 0.00], |
587 | [0.18, 0.54, 0.34], |
821 | [0.18, 0.54, 0.34], |
588 | [0.56, 0.73, 0.56], |
822 | [0.56, 0.73, 0.56], |
589 | [0.80, 0.80, 0.80], |
823 | [0.80, 0.80, 0.80], |
590 | [0.75, 0.61, 0.20], |
824 | [0.75, 0.61, 0.20], |
591 | [0.99, 0.77, 0.26], |
825 | [0.99, 0.77, 0.26], |
592 | [0.74, 0.65, 0.41], |
826 | [0.74, 0.65, 0.41], |
593 | ); |
827 | ); |
594 | |
828 | |
|
|
829 | sub msg { |
|
|
830 | my ($self, $color, $type, $text, @extra) = @_; |
|
|
831 | |
|
|
832 | $text = sanitise_xml $text; |
|
|
833 | |
|
|
834 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
835 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
836 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
837 | $type =~ s/-/_/g; |
|
|
838 | $self->{$type} = $text; |
|
|
839 | } else { |
595 | $self->logprint ("info: ", $text); |
840 | $self->logprint ("msg: ", $text); |
|
|
841 | return if $color < 0; # negative color == ignore if not understood |
596 | |
842 | |
597 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
843 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
598 | |
844 | |
599 | # try to create single paragraphs of multiple lines sent by the server |
845 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
846 | # no longer neecssary with TRT servers |
600 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
847 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
601 | |
848 | |
602 | $text = CFClient::UI::Label::escape $text; |
849 | ::message ({ fg => $fg, markup => $_ }) |
603 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
850 | for split /\n/, $text; |
604 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
605 | |
851 | |
606 | $self->{logview}->add_paragraph ($color[$color], $_) |
|
|
607 | for map "$time $_", split /\n/, $text; |
|
|
608 | $self->{logview}->scroll_to_bottom; |
|
|
609 | |
|
|
610 | $self->{statusbox}->add ($text, |
852 | $self->{statusbox}->add ($text, |
611 | group => $text, |
853 | group => $text, |
612 | fg => $color[$color], |
854 | fg => $fg, |
613 | timeout => $color >= 2 ? 60 : 10, |
855 | timeout => $color >= 2 ? 180 : 10, |
614 | tooltip_font => $::FONT_FIXED, |
856 | tooltip_font => $::FONT_FIXED, |
615 | ); |
857 | ); |
616 | } |
858 | } |
617 | |
|
|
618 | sub drawextinfo { |
|
|
619 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
620 | |
|
|
621 | $self->drawinfo ($color, $message); |
|
|
622 | } |
859 | } |
623 | |
860 | |
624 | sub spell_add { |
861 | sub spell_add { |
625 | my ($self, $spell) = @_; |
862 | my ($self, $spell) = @_; |
626 | |
863 | |
627 | # try to create single paragraphs of multiple lines sent by the server |
864 | # try to create single paragraphs out of the multiple lines sent by the server |
628 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
865 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
629 | $spell->{message} =~ s/\n+$//; |
866 | $spell->{message} =~ s/\n+$//; |
630 | $spell->{message} ||= "Server did not provide a description for this spell."; |
867 | $spell->{message} ||= "Server did not provide a description for this spell."; |
631 | |
868 | |
632 | $::SPELL_PAGE->add_spell ($spell); |
869 | $::SPELL_LIST->add_spell ($spell); |
633 | |
870 | |
634 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); |
871 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
635 | $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); |
872 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
636 | } |
873 | } |
637 | |
874 | |
638 | sub spell_delete { |
875 | sub spell_delete { |
639 | my ($self, $spell) = @_; |
876 | my ($self, $spell) = @_; |
640 | |
877 | |
641 | $::SPELL_PAGE->remove_spell ($spell); |
878 | $::SPELL_LIST->remove_spell ($spell); |
|
|
879 | } |
|
|
880 | |
|
|
881 | sub setup { |
|
|
882 | my ($self, $setup) = @_; |
|
|
883 | |
|
|
884 | $self->{map_widget}->set_tilesize ($self->{tilesize}); |
|
|
885 | $::MAP->resize ($self->{mapw}, $self->{maph}); |
642 | } |
886 | } |
643 | |
887 | |
644 | sub addme_success { |
888 | sub addme_success { |
645 | my ($self) = @_; |
889 | my ($self) = @_; |
646 | |
890 | |
647 | my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { |
|
|
648 | my ($pom) = @_; |
|
|
649 | |
|
|
650 | my %skill_help; |
891 | my %skill_help; |
651 | |
892 | |
652 | for my $head2 ($pom->head1->[3]->head2) { |
893 | for my $node (CFPlus::Pod::find skill_description => "*") { |
653 | $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; |
894 | my (undef, @par) = CFPlus::Pod::section_of $node; |
654 | } |
895 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
655 | |
|
|
656 | \%skill_help |
|
|
657 | }; |
896 | }; |
658 | |
897 | |
659 | for my $skill (values %{$self->{skill_info}}) { |
898 | for my $skill (values %{$self->{skill_info}}) { |
660 | $self->{map_widget}->add_command ("ready_skill $skill", |
899 | $self->{map_widget}->add_command ("ready_skill $skill", |
661 | (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") |
900 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
662 | . $skill_help->{$skill}); |
901 | . $skill_help{$skill}); |
663 | $self->{map_widget}->add_command ("use_skill $skill", |
902 | $self->{map_widget}->add_command ("use_skill $skill", |
664 | (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") |
903 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
665 | . $skill_help->{$skill}); |
904 | . $skill_help{$skill}); |
666 | } |
905 | } |
667 | } |
906 | } |
668 | |
907 | |
669 | sub eof { |
908 | sub eof { |
670 | my ($self) = @_; |
909 | my ($self) = @_; |
… | |
… | |
694 | |
933 | |
695 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
934 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
696 | |
935 | |
697 | $self->send ("requestinfo image_sums $face $face"); |
936 | $self->send ("requestinfo image_sums $face $face"); |
698 | |
937 | |
699 | $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", |
938 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
700 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
939 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
701 | } elsif (!exists $self->{num_faces}) { |
940 | } elsif (!exists $self->{num_faces}) { |
702 | $self->send ("requestinfo image_info"); |
941 | $self->send ("requestinfo image_info"); |
703 | |
942 | |
704 | $self->{num_faces} = 0; |
943 | $self->{num_faces} = 0; |
705 | |
944 | |
706 | $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", |
945 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
707 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
946 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
708 | } |
947 | } |
709 | } |
948 | } |
710 | |
949 | |
711 | sub update_floorbox { |
950 | sub update_floorbox { |
712 | $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
951 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
713 | return unless $::CONN; |
952 | return unless $::CONN; |
714 | |
953 | |
715 | $::FLOORBOX->clear; |
954 | $::FLOORBOX->clear; |
716 | |
955 | |
717 | my $row; |
956 | my $row; |
718 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
957 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
719 | if ($row < 6) { |
958 | if ($row < 6) { |
720 | local $_->{face_widget}; # hack to force recreation of widget |
959 | local $_->{face_widget}; # hack to force recreation of widget |
721 | local $_->{desc_widget}; # hack to force recreation of widget |
960 | local $_->{desc_widget}; # hack to force recreation of widget |
722 | CFClient::Item::update_widgets $_; |
961 | CFPlus::Item::update_widgets $_; |
723 | |
962 | |
724 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
963 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
725 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
964 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
726 | |
965 | |
727 | $row++; |
966 | $row++; |
728 | } else { |
967 | } else { |
729 | $::FLOORBOX->add (1, $row, new CFClient::UI::Button |
968 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
730 | text => "More...", |
969 | text => "More...", |
731 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
970 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
732 | ); |
971 | ); |
733 | last; |
972 | last; |
734 | } |
973 | } |
735 | } |
974 | } |
736 | if ($::CONN->{open_container}) { |
975 | if ($::CONN->{open_container}) { |
737 | $::FLOORBOX->add (1, $row++, new CFClient::UI::Button |
976 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
738 | text => "Close container", |
977 | text => "Close container", |
739 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
978 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
740 | ); |
979 | ); |
741 | } |
980 | } |
742 | }); |
981 | }); |
… | |
… | |
748 | my ($conn, $tag, $name) = @_; |
987 | my ($conn, $tag, $name) = @_; |
749 | $conn->{open_container} = $tag; |
988 | $conn->{open_container} = $tag; |
750 | update_floorbox; |
989 | update_floorbox; |
751 | |
990 | |
752 | $::INV_RIGHT_HB->clear (); |
991 | $::INV_RIGHT_HB->clear (); |
753 | $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); |
992 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
754 | |
993 | |
755 | if ($tag != 0) { # Floor isn't closable, is it? |
994 | if ($tag != 0) { # Floor isn't closable, is it? |
756 | $::INV_RIGHT_HB->add (new CFClient::UI::Button |
995 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
757 | text => "Close container", |
996 | text => "Close container", |
758 | tooltip => "Close the currently open container (if one is open)", |
997 | tooltip => "Close the currently open container (if one is open)", |
759 | on_activate => sub { |
998 | on_activate => sub { |
760 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
999 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
761 | if $tag != 0; |
1000 | if $tag != 0; |
… | |
… | |
769 | } |
1008 | } |
770 | |
1009 | |
771 | sub update_containers { |
1010 | sub update_containers { |
772 | my ($self) = @_; |
1011 | my ($self) = @_; |
773 | |
1012 | |
774 | $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1013 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
775 | my $todo = delete $self->{update_container} |
1014 | my $todo = delete $self->{update_container} |
776 | or return; |
1015 | or return; |
777 | |
1016 | |
778 | for my $tag (keys %$todo) { |
1017 | for my $tag (keys %$todo) { |
779 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1018 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
816 | sub item_update { |
1055 | sub item_update { |
817 | my ($self, $item) = @_; |
1056 | my ($self, $item) = @_; |
818 | |
1057 | |
819 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1058 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
820 | |
1059 | |
821 | CFClient::Item::update_widgets $item; |
1060 | CFPlus::Item::update_widgets $item; |
822 | |
1061 | |
823 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1062 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
824 | set_opencont ($::CONN, 0, "Floor"); |
1063 | set_opencont ($::CONN, 0, "Floor"); |
825 | |
1064 | |
826 | } elsif ($item->{flags} & F_OPEN) { |
1065 | } elsif ($item->{flags} & F_OPEN) { |
827 | set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); |
1066 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
828 | |
1067 | |
829 | } else { |
1068 | } else { |
830 | $self->{update_container}{$item->{container}}++; |
1069 | $self->{update_container}{$item->{container}}++; |
831 | $self->update_containers; |
1070 | $self->update_containers; |
832 | } |
1071 | } |
833 | } |
1072 | } |
834 | |
1073 | |
835 | sub player_update { |
1074 | sub player_update { |
836 | my ($self, $player) = @_; |
1075 | my ($self, $player) = @_; |
|
|
1076 | |
|
|
1077 | $self->update_weight; |
|
|
1078 | } |
|
|
1079 | |
|
|
1080 | sub update_weight { |
|
|
1081 | my ($self) = @_; |
|
|
1082 | |
|
|
1083 | my $weight = .001 * $self->{player}{weight}; |
|
|
1084 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
|
|
1085 | |
837 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); |
1086 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
|
|
1087 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
|
|
1088 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
838 | } |
1089 | } |
839 | |
1090 | |
840 | sub update_server_info { |
1091 | sub update_server_info { |
841 | my ($self) = @_; |
1092 | my ($self) = @_; |
842 | |
1093 | |
… | |
… | |
845 | $::SERVER_INFO->set_markup ( |
1096 | $::SERVER_INFO->set_markup ( |
846 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1097 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
847 | . "protocol version <tt>$self->{version}</tt>\n" |
1098 | . "protocol version <tt>$self->{version}</tt>\n" |
848 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1099 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
849 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1100 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1101 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
|
|
1102 | . "editing support $yesno[!!$self->{editor_support}]\n" |
|
|
1103 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1104 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
850 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1105 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
851 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1106 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
852 | . "map size $self->{mapw}×$self->{maph}\n" |
1107 | . "map size $self->{mapw}×$self->{maph}\n" |
853 | ); |
1108 | ); |
|
|
1109 | |
|
|
1110 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
854 | } |
1111 | } |
855 | |
1112 | |
856 | sub logged_in { |
1113 | sub logged_in { |
857 | my ($self) = @_; |
1114 | my ($self) = @_; |
858 | |
1115 | |
859 | $self->send_ext_req (cfplus_support => "1", sub { |
1116 | $self->send_ext_req (cfplus_support => version => 1, sub { |
860 | $self->{cfplus_ext} = $_[0]; |
1117 | $self->{cfplus_ext} = $_[0]{version}; |
861 | $self->update_server_info; |
1118 | $self->update_server_info; |
|
|
1119 | |
|
|
1120 | if ($self->{cfplus_ext} >= 2) { |
|
|
1121 | $self->send_ext_req ("editor_support", sub { |
|
|
1122 | $self->{editor_support} = $_[0]; |
|
|
1123 | $self->update_server_info; |
|
|
1124 | |
|
|
1125 | 0 |
|
|
1126 | }); |
|
|
1127 | } |
|
|
1128 | |
|
|
1129 | 0 |
862 | }); |
1130 | }); |
863 | |
1131 | |
864 | $self->update_server_info; |
1132 | $self->update_server_info; |
865 | |
1133 | |
866 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1134 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
867 | $self->send_command ("output-count $::CFG->{output_count}"); |
1135 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
1136 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
868 | $self->send_command ("pickup $::CFG->{pickup}"); |
1137 | $self->send_command ("pickup $::CFG->{pickup}"); |
|
|
1138 | } |
|
|
1139 | |
|
|
1140 | sub buildat { |
|
|
1141 | my ($self, $builditem, $x, $y) = @_; |
|
|
1142 | |
|
|
1143 | if ($self->{cfplus_ext}) { |
|
|
1144 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
1145 | } |
869 | } |
1146 | } |
870 | |
1147 | |
871 | sub lookat { |
1148 | sub lookat { |
872 | my ($self, $x, $y) = @_; |
1149 | my ($self, $x, $y) = @_; |
873 | |
1150 | |
874 | if ($self->{cfplus_ext}) { |
1151 | if ($self->{cfplus_ext}) { |
875 | $self->send_ext_req (lookat => "$x $y", sub { |
1152 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
876 | my %res = split /\x00/, $_[0]; |
1153 | my ($msg) = @_; |
877 | |
1154 | |
878 | if (exists $res{npc_dialog}) { |
1155 | if (exists $msg->{npc_dialog}) { |
879 | # start npc chat dialog |
1156 | # start npc chat dialog |
880 | $self->{npc_dialog} = new CFClient::NPCDialog:: |
1157 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
881 | dx => $x, |
1158 | dx => $x, |
882 | dy => $y, |
1159 | dy => $y, |
883 | title => "$res{npc_dialog} (NPC)", |
1160 | title => "$msg->{npc_dialog} (NPC)", |
884 | conn => $self, |
1161 | conn => $self, |
885 | ; |
1162 | ; |
886 | } |
1163 | } |
887 | }); |
1164 | }); |
888 | } |
1165 | } |
… | |
… | |
891 | } |
1168 | } |
892 | |
1169 | |
893 | sub destroy { |
1170 | sub destroy { |
894 | my ($self) = @_; |
1171 | my ($self) = @_; |
895 | |
1172 | |
896 | $self->{npc_dialog}->destroy |
1173 | (delete $self->{npc_dialog})->destroy |
897 | if $self->{npc_dialog}; |
1174 | if $self->{npc_dialog}; |
898 | |
1175 | |
899 | $self->SUPER::destroy; |
1176 | $self->SUPER::destroy; |
900 | } |
|
|
901 | |
1177 | |
|
|
1178 | %$self = (); |
|
|
1179 | } |
|
|
1180 | |
902 | package CFClient::NPCDialog; |
1181 | package CFPlus::NPCDialog; |
903 | |
1182 | |
904 | our @ISA = 'CFClient::UI::FancyFrame'; |
1183 | our @ISA = 'CFPlus::UI::Toplevel'; |
905 | |
1184 | |
906 | sub new { |
1185 | sub new { |
907 | my $class = shift; |
1186 | my $class = shift; |
908 | |
1187 | |
909 | my $self = $class->SUPER::new ( |
1188 | my $self = $class->SUPER::new ( |
… | |
… | |
912 | name => "npc_dialog", |
1191 | name => "npc_dialog", |
913 | force_w => $::WIDTH * 0.7, |
1192 | force_w => $::WIDTH * 0.7, |
914 | force_h => $::HEIGHT * 0.7, |
1193 | force_h => $::HEIGHT * 0.7, |
915 | title => "NPC Dialog", |
1194 | title => "NPC Dialog", |
916 | kw => { hi => 0, yes => 0, no => 0 }, |
1195 | kw => { hi => 0, yes => 0, no => 0 }, |
|
|
1196 | has_close_button => 1, |
917 | @_, |
1197 | @_, |
918 | ); |
1198 | ); |
919 | |
1199 | |
920 | Scalar::Util::weaken (my $this = $self); |
1200 | CFPlus::weaken (my $this = $self); |
|
|
1201 | |
|
|
1202 | $self->connect (delete => sub { $this->destroy; 1 }); |
921 | |
1203 | |
922 | # better use a pane... |
1204 | # better use a pane... |
923 | $self->add (my $hbox = new CFClient::UI::HBox); |
1205 | $self->add (my $hbox = new CFPlus::UI::HBox); |
924 | $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); |
1206 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
925 | |
1207 | |
926 | $hbox->add (my $vbox = new CFClient::UI::VBox); |
1208 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
927 | |
1209 | |
928 | $vbox->add (new CFClient::UI::Label text => "Message Entry:"); |
1210 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
929 | $vbox->add ($self->{entry} = new CFClient::UI::Entry |
1211 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
930 | tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" |
1212 | tooltip => "#npc_message_entry", |
931 | . "Sometimes you have to tell an NPC something you cannot find out during " |
|
|
932 | . "a normal conversation (such as a password). In those cases you have to use " |
|
|
933 | . "this text entry. You can also enter responses manually instead of using the response " |
|
|
934 | . "buttons below.", |
|
|
935 | on_activate => sub { |
1213 | on_activate => sub { |
936 | my ($entry, $text) = @_; |
1214 | my ($entry, $text) = @_; |
937 | |
1215 | |
938 | return unless $text =~ /\S/; |
1216 | return unless $text =~ /\S/; |
939 | |
1217 | |
… | |
… | |
942 | |
1220 | |
943 | 0 |
1221 | 0 |
944 | }, |
1222 | }, |
945 | ); |
1223 | ); |
946 | |
1224 | |
947 | $vbox->add ($self->{options} = new CFClient::UI::VBox); |
1225 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
948 | |
1226 | |
949 | $self->{bye_button} = new CFClient::UI::Button |
1227 | $self->{bye_button} = new CFPlus::UI::Button |
950 | text => "Bye (close)", |
1228 | text => "Bye (close)", |
951 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1229 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
952 | on_activate => sub { $this->destroy; 0 }, |
1230 | on_activate => sub { $this->destroy; 1 }, |
953 | ; |
1231 | ; |
954 | |
1232 | |
955 | $self->update_options; |
1233 | $self->update_options; |
956 | |
1234 | |
957 | $self->{token} = $self->{conn}->ext_token; |
1235 | $self->{id} = $self->{conn}->send_ext_req ( |
958 | $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); |
1236 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
959 | $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); |
1237 | sub { $this && $this->feed (@_) } |
|
|
1238 | ); |
960 | |
1239 | |
961 | $self->{entry}->grab_focus; |
1240 | $self->{entry}->grab_focus; |
962 | |
1241 | |
963 | $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); |
1242 | $self->{textview}->add_paragraph ({ |
|
|
1243 | fg => [1, 1, 0, 1], |
|
|
1244 | markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n", |
|
|
1245 | }); |
964 | |
1246 | |
965 | $self->show; |
1247 | $self->show; |
966 | $self |
1248 | $self |
967 | }; |
1249 | }; |
968 | |
1250 | |
969 | sub update_options { |
1251 | sub update_options { |
970 | my ($self) = @_; |
1252 | my ($self) = @_; |
971 | |
1253 | |
972 | Scalar::Util::weaken $self; |
1254 | CFPlus::weaken $self; |
973 | |
1255 | |
974 | $self->{options}->clear; |
1256 | $self->{options}->clear; |
975 | $self->{options}->add ($self->{bye_button}); |
1257 | $self->{options}->add ($self->{bye_button}); |
976 | |
1258 | |
977 | for my $kw (sort keys %{ $self->{kw} }) { |
1259 | for my $kw (sort keys %{ $self->{kw} }) { |
978 | $self->{options}->add (new CFClient::UI::Button |
1260 | $self->{options}->add (new CFPlus::UI::Button |
979 | text => $kw, |
1261 | text => $kw, |
980 | on_activate => sub { |
1262 | on_activate => sub { |
981 | $self->send ($kw); |
1263 | $self->send ($kw); |
982 | 0 |
1264 | 0 |
983 | }, |
1265 | }, |
984 | ); |
1266 | ); |
985 | } |
1267 | } |
986 | } |
1268 | } |
987 | |
1269 | |
988 | sub feed { |
1270 | sub feed { |
989 | my ($self, $data) = @_; |
1271 | my ($self, $msg) = @_; |
990 | |
1272 | |
991 | Scalar::Util::weaken $self; |
1273 | CFPlus::weaken $self; |
992 | |
1274 | |
993 | my ($type, $msg) = split / /, $data, 2; |
1275 | if ($msg->{msgtype} eq "reply") { |
|
|
1276 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
|
|
1277 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
994 | |
1278 | |
995 | if ($type eq "msg") { |
1279 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
996 | my ($msg, @kw) = split /\x00/, $msg; |
|
|
997 | |
|
|
998 | utf8::decode $_ for ($msg, @kw); |
|
|
999 | |
|
|
1000 | $self->{kw}{$_} = 1 for @kw; |
|
|
1001 | |
|
|
1002 | $msg = "\n" . CFClient::UI::Label::escape $msg; |
|
|
1003 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1280 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1004 | my @link; |
1281 | my @link; |
1005 | $msg =~ s{ |
1282 | $text =~ s{ |
1006 | ($match) |
1283 | ($match) |
1007 | }{ |
1284 | }{ |
1008 | my $kw = $1; |
1285 | my $kw = $1; |
1009 | |
1286 | |
1010 | push @link, new CFClient::UI::Label |
1287 | push @link, new CFPlus::UI::Label |
1011 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1288 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1012 | can_hover => 1, |
1289 | can_hover => 1, |
1013 | can_events => 1, |
1290 | can_events => 1, |
1014 | padding_x => 0, |
1291 | padding_x => 0, |
1015 | padding_y => 0, |
1292 | padding_y => 0, |
1016 | on_button_up => sub { |
1293 | on_button_up => sub { |
1017 | $self->send ($kw); |
1294 | $self->send ($kw); |
1018 | }; |
1295 | }; |
1019 | |
1296 | |
1020 | chr 0xfffc |
1297 | "\x{fffc}" |
1021 | }giex; |
1298 | }giex; |
1022 | |
1299 | |
1023 | $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); |
1300 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1024 | $self->{textview}->scroll_to_bottom; |
1301 | $self->{textview}->scroll_to_bottom; |
1025 | $self->update_options; |
1302 | $self->update_options; |
1026 | } else { |
1303 | } else { |
1027 | $self->destroy; |
1304 | $self->destroy; |
1028 | } |
1305 | } |
… | |
… | |
1031 | } |
1308 | } |
1032 | |
1309 | |
1033 | sub send { |
1310 | sub send { |
1034 | my ($self, $msg) = @_; |
1311 | my ($self, $msg) = @_; |
1035 | |
1312 | |
1036 | $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); |
1313 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1037 | $self->{textview}->scroll_to_bottom; |
1314 | $self->{textview}->scroll_to_bottom; |
1038 | |
1315 | |
1039 | utf8::encode $msg; |
1316 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1040 | $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); |
|
|
1041 | } |
1317 | } |
1042 | |
1318 | |
1043 | sub destroy { |
1319 | sub destroy { |
1044 | my ($self) = @_; |
1320 | my ($self) = @_; |
1045 | |
1321 | |
1046 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1322 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1047 | |
1323 | |
|
|
1324 | if ($self->{conn}) { |
1048 | $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; |
1325 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1049 | delete $self->{conn}{npc_dialog}; |
1326 | delete $self->{conn}{npc_dialog}; |
1050 | $self->{conn}->disconnect_ext ($self->{token}); |
1327 | $self->{conn}->disconnect_ext ($self->{id}); |
|
|
1328 | } |
1051 | |
1329 | |
1052 | $self->SUPER::destroy; |
1330 | $self->SUPER::destroy; |
1053 | } |
1331 | } |
1054 | |
1332 | |
1055 | 1; |
1333 | 1 |
|
|
1334 | |