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.65 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.214 by root, Tue Dec 22 00:35:44 2009 UTC

1package CFClient::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Guard ();
7
6use Crossfire::Protocol::Constants; 8use Deliantra::Protocol::Constants;
7 9
8use CFClient; 10use DC;
9use CFClient::UI; 11use DC::DB;
10use CFClient::Pod; 12use DC::UI;
13use DC::Pod;
14use DC::Macro;
15use DC::Item;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Deliantra::Protocol::Base';
18
19our $TEX_DIALOGUE = new_from_resource DC::Texture
20 "dialogue.png", minify => 1, mipmap => 1;
21
22our $TEX_NOFACE = new_from_resource DC::Texture
23 "noface.png", minify => 1, mipmap => 1, wrap => 1;
24
25sub MIN_TEXTURE_UNUSED() { 1 }#d#
13 26
14sub new { 27sub new {
15 my $class = shift; 28 my ($class, %arg) = @_;
16 29
17 my $self = $class->SUPER::new (@_); 30 my $self = $class->SUPER::new (%arg,
31 setup_req => {
32 extmap => 1,
33 excmd => 1,
34 widget => 2,
35 %{$arg{setup_req} || {}},
36 },
37 );
18 38
19 $self->{map_widget}->clr_commands; 39 $self->{map_widget}->clr_commands;
20 40
21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 41 my @cmd_help = map {
22 my ($pom) = @_; 42 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
43 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
23 44
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next;
29
30 my $cmd = $1; 45 my $cmd = $1;
31 my @args = split /\|/, $2; 46 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 47 @args = (".*") unless @args;
33 48
49 my (undef, @par) = DC::Pod::section_of $_;
50 my $text = DC::Pod::as_label @par;
51
34 $_ = $_ eq ".*" ? "" : " $_" 52 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 53 for @args;
36 54
37 my $text = CFClient::Pod::as_xml $head2->content; 55 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 56 sort { (length $a) <=> (length $b) }
41 @args; 57 @args
58 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
59 DC::Pod::find command => "*";
60
61 $self->{json_coder}
62 ->convert_blessed
63 ->filter_json_single_key_object ("\fw" => sub {
64 $self->{widget}{$_[0]}
42 } 65 })
66 ->filter_json_single_key_object ("\fc" => sub {
67 my ($id) = @_;
68 sub {
69 $self->send_exti_msg (w_e => $id, @_);
70 }
71 });
43 72
73 # destroy widgets on logout
74 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
75 for my $ws (values %{delete $self->{widgetset} || {}}) {
76 $_->destroy
77 for values %{delete $ws->{w} || {}};
78 }
79
80 delete $self->{items};
81 $::INV->clear;
82 $::INVR->clear;
83 $::INVR_HB->clear;
84 $::FLOORBOX->clear;
85 });
86
87 $self->{map_widget}->add_command (@$_)
44 \@cmd_help 88 for @cmd_help;
89
90 {
91 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
92 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
93 }
94
95 {
96 $self->{noface} = my $tex = $TEX_NOFACE;
97 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
98 }
99
100# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
101# $self->{expire_w} = EV::timer 1, 1, sub {
102# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
103#
104# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
105# warn DC::SvREFCNT $self->{texture}[$_];
106# $self->{texture}[$_]->unload;
107# warn "expire texture $_\n";#d#
108# }
109#
110# ($self->{expire_count} += $count) < @{ $self->{texture} }
111# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
112# warn "count is $count\n";#d#
113# };
114
115 $self->{open_container} = 0;
116
117 # per server
118 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
119
120 $self
121}
122
123sub update_fx_want {
124 my ($self) = @_;
125
126 $self->send_exti_msg (fx_want => {
127 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
128 5 => !!$::CFG->{audio_enable}, # FT_SOUND
129 6 => 1, # FT_RSRC
130 });
131}
132
133sub ext_capabilities {
134 my ($self, %cap) = @_;
135
136 $self->update_fx_want;
137
138 $self->send_exti_req (resource => "exp_table", sub {
139 my ($exp_table) = @_;
140
141 $self->register_face_handler ($exp_table, sub {
142 my ($face) = @_;
143
144 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
145 $_->() for values %{ $self->{on_exp_update} || {} };
146 });
147
148 ()
149 });
150
151 if (my $ts = $cap{tileset}) {
152 if (my ($default) = grep $_->[2] & 1, @$ts) {
153 $self->{tileset} = $default;
154 $self->{tilesize} = $default->[3];
155 $self->setup_req (tileset => $default->[0]);
156
157 my $w = int $self->{mapw} * 32 / $self->{tilesize};
158 my $h = int $self->{maph} * 32 / $self->{tilesize};
159
160 $self->setup_req (mapsize => "${w}x${h}");
161 }
162 }
163}
164
165sub ext_ambient_music {
166 my ($self, $songs) = @_;
167 &::audio_music_set_ambient ($songs);
168}
169
170#############################################################################
171
172sub widget_associate {
173 my ($self, $ws, $id, $widget) = @_;
174
175 $widget ||= new DC::UI::Bin;
176
177 $widget->{s_id} = $id;
178 $self->{widget}{$id} = $widget;
179
180 if ($ws) {
181 $widget->{s_ws} = $ws;
182 $self->{widgetset}{$ws}{w}{$id} = $widget;
183 }
184
185 $widget->connect (on_destroy => sub {
186 my ($widget) = @_;
187
188 delete $self->{widget}{$widget->{s_id}};
189 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
190 if exists $widget->{s_ws};
191 });
192}
193
194# widgetset new
195sub ext_ws_n {
196 my ($self, $id) = @_;
197
198 $self->{widgetset}{$id} = {
199 w => {},
45 }; 200 };
46
47 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help;
49
50 $self->{noface} = new_from_file CFClient::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
52
53 $self->{open_container} = 0;
54
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
61
62 $self
63} 201}
202
203# widgetset destroy
204sub ext_ws_d {
205 my ($self, $id) = @_;
206
207 my $ws = delete $self->{widgetset}{$id}
208 or return;
209
210 $_->destroy
211 for values %{$ws->{w}};
212}
213
214# widgetset create
215sub ext_ws_c {
216 my ($self, $ws, $id, $class, $args) = @_;
217
218 $self->widget_associate (
219 $ws, $id => scalar eval {
220 local $SIG{__DIE__};
221 "DC::UI::$class"->new (%$args)
222 }
223 );
224}
225
226# widgetset create template
227sub ext_ws_ct {
228 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
229
230 $done_cb ||= sub { };
231
232 my $parse_list; $parse_list = sub {
233 my ($list) = @_;
234 my @w;
235
236 while (@$list) {
237 my ($class, $args) = splice @$list, 0, 2;
238 my $name = delete $args->{s_id};
239 my $cl = delete $args->{s_cl};
240 my $cfg = delete $cfg->{$name};
241 my $id = delete $cfg->{id};
242 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
243 or next;
244
245 $self->widget_associate ($ws, $id, $w)
246 if $id;
247
248 $w->add ($parse_list->($cl))
249 if $cl;
250
251 push @w, $w;
252 }
253
254 @w
255 };
256
257 # either array reference, or face #
258 if ($type eq "inline") {
259 $done_cb->();
260 $parse_list->($template);
261 } elsif ($type eq "face") {
262 my $handler; $handler = $self->register_face_handler ($template, sub {
263 my ($face) = @_;
264
265 undef $handler;
266 $done_cb->();
267 $parse_list->($self->{json_coder}->decode ($face->{data}));
268 });
269 } else {
270 $done_cb->(0);
271 }
272}
273
274# widgetset associate
275sub ext_ws_a {
276 my ($self, %ass) = @_;
277
278 # everything that has a name, wether conceivably useful or not
279 my %wkw = (
280 root => $DC::UI::ROOT,
281 tooltip => $DC::UI::TOOLTIP,
282
283 mapwidget => $::MAPWIDGET,
284 menubar => $::MENUBAR,
285 menupopup => $::MENUPOPUP,
286 pickup_enable => $::PICKUP_ENABLE,
287 buttonbar => $::BUTTONBAR,
288 metaserver => $::METASERVER,
289 buttonbar => $::BUTTONBAR,
290 login_button => $::LOGIN_BUTTON,
291 quit_dialog => $::QUIT_DIALOG,
292 host_entry => $::HOST_ENTRY,
293 metaserver => $::METASERVER,
294 server_info => $::SERVER_INFO,
295
296 setup_dialog => $::SETUP_DIALOG,
297 setup_notebook => $::SETUP_NOTEBOOK,
298 setup_server => $::SETUP_SERVER,
299 setup_keyboard => $::SETUP_KEYBOARD,
300
301 pl_notebook => $::PL_NOTEBOOK,
302 pl_window => $::PL_WINDOW,
303 inventory_page => $::INVENTORY_PAGE,
304 stats_page => $::STATS_PAGE,
305 skill_page => $::SKILL_PAGE,
306 spell_page => $::SPELL_PAGE,
307 spell_list => $::SPELL_LIST,
308
309 floorbox => $::FLOORBOX,
310 help_window => $::HELP_WINDOW,
311 message_window => $::MESSAGE_WINDOW,
312 message_dist => $::MESSAGE_DIST,
313 statusbox => $::STATUSBOX,
314
315 inv => $::INV,
316 invr => $::INVR,
317 invr_hb => $::INVR_HB,
318 );
319
320 while (my ($id, $name) = each %ass) {
321 $self->widget_associate (undef, $id => $wkw{$name});
322 }
323}
324
325# widget call
326sub ext_w_c {
327 my ($self, $id, $rcb, $method, @args) = @_;
328
329 my $w = $self->{widget}{$id}
330 or return;
331
332 if ($rcb) {
333 $rcb->($w->$method (@args));
334 } else {
335 $w->$method (@args);
336 }
337}
338
339# widget set
340sub ext_w_s {
341 my ($self, $id, $attr) = @_;
342
343 my $w = $self->{widget}{$id}
344 or return;
345
346 for (my $i = 0; $i < $#$attr; $i += 2) {
347 my ($member, $value) = @$attr[$i, $i+1];
348 if (defined $value) {
349 $w->{$member} = $value;
350 } else {
351 delete $w->{$member};
352 }
353 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
354 }
355}
356
357# widget get
358sub ext_w_g {
359 my ($self, $id, $rid, @attr) = @_;
360
361 my $w = $self->{widget}{$id}
362 or return;
363
364 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
365}
366
367# message window
368sub ext_channel_info {
369 my ($self, $info) = @_;
370 $self->{channels}->{$info->{id}} = $info;
371 $::MESSAGE_DIST->add_channel ($info);
372}
373
374#############################################################################
64 375
65sub logprint { 376sub logprint {
66 my ($self, @a) = @_; 377 my ($self, @a) = @_;
67 378
68 $self->{log_fh} ||= do { 379 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
69 my $path = "$Crossfire::VARDIR/log.$self->{host}";
70
71 open my $fh, ">>:utf8", $path
72 or die "Couldn't open logfile $path: $!";
73
74 $fh->autoflush (1);
75
76 $fh;
77 };
78
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84 print {$self->{log_fh}} "$ts ", @a, "\n";
85} 380}
86 381
87sub _stat_numdiff { 382sub _stat_numdiff {
88 my ($self, $name, $old, $new) = @_; 383 my ($self, $name, $old, $new) = @_;
89 384
… …
107 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 402 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
108 : () 403 : ()
109 } 404 }
110 sort { $a <=> $b } keys %{$self->{spell_paths}}; 405 sort { $a <=> $b } keys %{$self->{spell_paths}};
111 406
112 join "", @diff 407 "\u$name: " . (join ", ", @diff)
113} 408}
114 409
115# all stats that are chacked against changes 410# all stats that are chacked against changes
116my @statchange = ( 411my @statchange = (
117 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 412 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
172 } 467 }
173 468
174 if ( 469 if (
175 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 470 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
176 ) { 471 ) {
177 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 472 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
178 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 473 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
179 } 474 }
180 475
181 $self->update_stats_window ($stats, $prev); 476 $self->update_stats_window ($stats, $prev);
182 477
183 $self->{prev_stats} = { %$stats }; 478 $self->{prev_stats} = { %$stats };
… …
220 515
221 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 516 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 517 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 518 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 519 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 520 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 521 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 522 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
228 $rng =~ s/^Range: //; # thank you so much dear server 523 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
229 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
230 my $title = $stats->{+CS_STAT_TITLE}; 524 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 525 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 526 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 527
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 528 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
251 for keys %RES_TBL; 545 for keys %RES_TBL;
252 546
253 my $sktbl = $::STATWIDS->{skill_tbl}; 547 my $sktbl = $::STATWIDS->{skill_tbl};
254 my @skills = keys %{ $self->{skill_info} }; 548 my @skills = keys %{ $self->{skill_info} };
255 549
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 550 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
551 map [$_, $self->{skill_info}{$_}],
552 grep exists $stats->{$_},
553 @skills;
554
555 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
556 $self->{stat_order} = join ",", map $_->[0], @order;
557
257 $sktbl->clear; 558 $sktbl->clear;
258 559
560 my $sw = $self->{skillwid}{""} ||= [
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 561 0, 0, (new DC::UI::Label text => "Experience", align => 1),
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 562 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 563 2, 0, (new DC::UI::Label text => "Progress"),
564 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 565 4, 0, (new DC::UI::Label text => "Experience", align => 1),
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 566 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 567 6, 0, (new DC::UI::Label text => "Progress"),
568 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
569 ];
570
571 my @add = @$sw;
572
573 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
574
575 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
576 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
265 577
266 my ($x, $y) = (0, 1); 578 my ($x, $y) = (0, 1);
267 for ( 579 for (@order) {
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_},
271 @skills
272 ) {
273 my ($idx, $name) = @$_; 580 my ($idx, $name) = @$_;
274 581
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 582 my $spell_cb = sub {
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 583 my ($widget, $ev) = @_;
277 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 584
585 if ($ev->{button} == 1) {
586 $::CONN->user_send ("ready_skill $name");
587 } elsif ($ev->{button} == 2) {
588 $::CONN->user_send ("use_skill $name");
589 } elsif ($ev->{button} == 3) {
590 my $shortname = DC::shorten $name, 14;
591 (new DC::UI::Menu
592 items => [
593 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
594 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
595 ],
596 )->popup ($ev);
597 } else {
598 return 0;
599 }
600
601 1
602 };
603
604 my $sw = $self->{skillwid}{$idx} ||= [
605 # exp
606 (new DC::UI::Label
607 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
608
609 # level
610 (new DC::UI::Label
278 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 611 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 612
613 # progress
614 (new DC::UI::ExperienceProgress),
615
616 # label
617 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
618 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
619 ];
620
621 push @add,
622 $x * 4 + 0, $y, $sw->[0],
623 $x * 4 + 1, $y, $sw->[1],
624 $x * 4 + 2, $y, $sw->[2],
625 $x * 4 + 3, $y, $sw->[3],
626 ;
280 627
281 $x++ and ($x, $y) = (0, $y + 1); 628 $x++ and ($x, $y) = (0, $y + 1);
282 } 629 }
283 }
284 630
285 for (grep exists $stats->{$_}, @skills) { 631 $sktbl->add_at (@add);
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 632 }
287 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 633
634 for (@order) {
635 my ($idx, $name) = @$_;
636 my $val = $stats->{$idx};
637
638 next if $prev->{$idx}[1] eq $val->[1];
639
640 my $sw = $self->{skillwid}{$idx};
641 $sw->[0]->set_text (::formsep ($val->[1]));
642 $sw->[1]->set_text ($val->[0] * 1);
643 $sw->[2]->set_value (@$val);
644
645 $::GAUGES->{skillexp}->set_label ("$name %d%%");
646 $::GAUGES->{skillexp}->set_value (@$val);
288 } 647 }
289} 648}
290 649
291sub user_send { 650sub user_send {
292 my ($self, $command) = @_; 651 my ($self, $command) = @_;
293 652
653 $self->{record}->($command)
294 if ($self->{record}) { 654 if $self->{record};
295 push @{$self->{record}}, $command;
296 }
297 655
298 $self->logprint ("send: ", $command); 656 $self->logprint ("send: ", $command);
299 $self->send_command ($command); 657 $self->send_command ($command);
300 ::status ($command);
301} 658}
302 659
303sub start_record { 660sub record {
304 my ($self) = @_; 661 my ($self, $cb) = @_;
305 662
306 $self->{record} = []; 663 $self->{record} = $cb;
307}
308
309sub stop_record {
310 my ($self) = @_;
311 return delete $self->{record};
312} 664}
313 665
314sub map_scroll { 666sub map_scroll {
315 my ($self, $dx, $dy) = @_; 667 my ($self, $dx, $dy) = @_;
316 668
317 $self->{map}->scroll ($dx, $dy); 669 $self->{map_widget}->scroll ($dx, $dy);
318} 670}
319 671
320sub feed_map1a { 672sub feed_map1a {
321 my ($self, $data) = @_; 673 my ($self, $data) = @_;
322 674
323 $self->{map}->map1a_update ($data); 675 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
676 my $delay;
677
678 for my $tile (@$missing) {
679 next if $self->{delay}{$tile};
680
681 $delay = 1;
682
683 if (my $tex = $self->{texture}[$tile]) {
684 $tex->upload;
685 } else {
686 $self->{delay}{$tile} = 1;
687
688 # we assume the face is in-flight and will eventually arrive
689 push @{$self->{tile_cb}{$tile}}, sub {
690 delete $self->{delay}{$tile};
691 $_[0]->upload;
692 };
693 }
694 }
695
696 if ($delay) {
697 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
698 EV::once undef, 0, 0.03, sub {
699 $self->{map_widget}->update
700 if $self->{map_widget};
701 };
702 } else {
324 $self->{map_widget}->update; 703 $self->{map_widget}->update;
704 }
325} 705}
326 706
327sub magicmap { 707sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 708 my ($self, $w, $h, $x, $y, $data) = @_;
329 709
… …
331} 711}
332 712
333sub flush_map { 713sub flush_map {
334 my ($self) = @_; 714 my ($self) = @_;
335 715
336 my $map_info = delete $self->{map_info} 716 return unless $self->{map_info};
337 or return;
338 717
718 for my $map_info (values %{ $self->{map_cache} || {} }) {
339 my ($hash, $x, $y, $w, $h) = @$map_info; 719 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
340 720
341 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 721 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
342 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 722
343 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 723 if ($data ne $$rdata) {
724 $map_info->[1] = \$data;
725 my $cdata = Compress::LZF::compress $data;
726 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
727 }
728 }
344} 729}
345 730
346sub map_clear { 731sub map_clear {
347 my ($self) = @_; 732 my ($self) = @_;
348 733
349 $self->flush_map; 734 $self->flush_map;
735 delete $self->{map_info};
350 delete $self->{neigh_map}; 736 delete $self->{neigh_map};
351 737
352 $self->{map}->clear; 738 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap}; 739 delete $self->{map_widget}{magicmap};
354} 740}
355 741
742sub bg_fetch {
743 my ($self) = @_;
356 744
745 my $tile;
746
747 do {
748 $tile = pop @{$self->{bg_fetch}}
749 or return;
750 } while $self->{texture}[$tile];
751
752 DC::DB::get tilecache => $tile, sub {
753 my ($data) = @_;
754
755 return unless $self->{map}; # stop when destroyed
756
757 if (defined $data) {
758 $self->have_tile ($tile, $data);
759 $self->{texture}[$tile]->upload;
760 }
761
762 $self->bg_fetch;
763 };
764}
765
357sub load_map($$$) { 766sub load_map($$$$$$) {
358 my ($self, $hash, $x, $y) = @_; 767 my ($self, $hash, $x, $y, $w, $h) = @_;
359 768
360 if (defined (my $data = $self->{mapcache}->get ($hash))) { 769 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
361 $data = Compress::LZF::decompress $data;
362 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
363 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
364 my $data = $self->{tilecache}->get ($id)
365 or next;
366 770
367 $self->set_texture ($id => $data); 771 my $cb = sub {
772 $map_info->[1] = \$_[0];
773
774 my $inprogress = @{ $self->{bg_fetch} || [] };
775 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
776 $self->bg_fetch unless $inprogress;
777 };
778
779 if (my $map_info = $self->{map_cache_old}{$hash}) {
780 $cb->(${ $map_info->[1] });
781 } else {
782 my $gen = $self->{map_change_gen};
783
784 DC::DB::get $self->{mapcache} => $hash, sub {
785 return unless $gen == $self->{map_change_gen};
786 return unless defined $_[0];
787 $cb->(Compress::LZF::decompress $_[0]);
368 } 788 };
369 } 789 }
370} 790}
371 791
372# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 792# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
373# (server resource,s latency, bandwidth), so this hack is warranted. 793# (server resources, latency, bandwidth), so this hack is warranted.
374# the right fix is to make real tiled maps with an overview file 794# the right fix is to make real tiled maps with an overview file
375sub send_mapinfo { 795sub send_mapinfo {
376 my ($self, $data, $cb) = @_; 796 my ($self, $data, $cb) = @_;
377 797
378 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 798 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
403} 823}
404 824
405# this method does a "flood fill" into every tile direction 825# this method does a "flood fill" into every tile direction
406# it assumes that tiles are arranged in a rectangular grid, 826# it assumes that tiles are arranged in a rectangular grid,
407# i.e. a map is the same as the left of the right map etc. 827# i.e. a map is the same as the left of the right map etc.
408# failure to comply are harmless and result in display errors 828# failure to comply is harmless and results in display errors
409# at worst. 829# at worst.
410sub flood_fill { 830sub flood_fill {
411 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 831 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
412 832
413 # the server does not allow map paths > 6 833 # the server does not allow map paths > 6
… …
438 858
439 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 859 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
440 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 860 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
441 861
442 } else { 862 } else {
863 my $gen = $self->{map_change_gen};
443 $self->send_mapinfo ("spatial $path$tile", sub { 864 $self->send_mapinfo ("spatial $path$tile", sub {
865 return unless $gen == $self->{map_change_gen};
866
444 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 867 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
445 868
446 return if $mode ne "spatial"; 869 return if $mode ne "spatial";
447 870
448 $x += $self->{map}->ox; 871 $x += $self->{map}->ox;
449 $y += $self->{map}->oy; 872 $y += $self->{map}->oy;
450 873
451 $self->load_map ($hash, $x, $y) 874 $self->load_map ($hash, $x, $y, $w, $h)
452 unless $self->{neigh_map}{$hash}[5]++;#d# 875 unless $self->{neigh_map}{$hash}[5]++;#d#
453 876
454 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 877 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
455 878
456 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 879 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
462 885
463sub map_change { 886sub map_change {
464 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 887 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 888
466 $self->flush_map; 889 $self->flush_map;
890
891 ++$self->{map_change_gen};
892 $self->{map_cache_old} = delete $self->{map_cache};
467 893
468 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 894 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
469 895
470 my $mapmapw = $self->{mapmap}->{w}; 896 my $mapmapw = $self->{mapmap}->{w};
471 my $mapmaph = $self->{mapmap}->{h}; 897 my $mapmaph = $self->{mapmap}->{h};
… …
483 $self->{map_info} = [$hash, $x, $y, $w, $h]; 909 $self->{map_info} = [$hash, $x, $y, $w, $h];
484 910
485 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 911 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
486 $::STATWIDS->{map}->set_text ("Map: " . $map); 912 $::STATWIDS->{map}->set_text ("Map: " . $map);
487 913
488 $self->load_map ($hash, $x, $y); 914 $self->load_map ($hash, $x, $y, $w, $h);
489 $self->flood_fill (0, 0, 0, "", $hash, $flags); 915 $self->flood_fill (0, 0, 0, "", $hash, $flags);
490} 916}
491 917
492sub face_find { 918sub face_find {
493 my ($self, $facenum, $face) = @_; 919 my ($self, $facenum, $face, $cb) = @_;
494 920
495 my $hash = "$face->{chksum},$face->{name}"; 921 if ($face->{type} == 0) { # FT_FACE
922 my $id = DC::DB::get_tile_id_sync $face->{name};
496 923
497 my $id = $self->{facemap}->get ($hash);
498
499 unless ($id) {
500 # create new id for face
501 # I love transactions
502 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) {
509 $txn->txn_commit;
510
511 goto gotid;
512 }
513 }
514 $txn->txn_abort;
515 }
516
517 CFClient::fatal "maximum number of transaction retries reached - database problems?";
518 }
519
520gotid:
521 $face->{id} = $id; 924 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id); 925 $self->{map}->set_tileid ($facenum => $id);
523 $self->{faceid}[$facenum] = $id;#d#
524 926
525 my $face = $self->{tilecache}->get ($id); 927 DC::DB::get tilecache => $id, $cb;
526 928
527 if ($face) { 929 } elsif ($face->{type} & 1) { # with metadata
528 #$self->face_prefetch; 930 DC::DB::get res_meta => $face->{name}, $cb;
529 $face 931
530 } else { 932 } else { # no metadata
531 my $tex = $self->{noface}; 933 DC::DB::get res_data => $face->{name}, $cb;
532 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
533 undef
534 }; 934 }
535} 935}
536 936
537sub face_update { 937sub face_update {
538 my ($self, $facenum, $face, $changed) = @_; 938 my ($self, $facenum, $face, $changed) = @_;
539 939
540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 940 if ($face->{type} == 0) {
941 # image, FT_FACE
942 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
943 if $changed;
541 944
542 $self->set_texture ($face->{id} => delete $face->{image}); 945 $self->have_tile ($face->{id}, delete $face->{data});
543}
544 946
545sub set_texture { 947 } elsif ($face->{type} & 1) {
948 # split metadata case, FT_MUSIC, FT_SOUND
949 if ($changed) { # new data
950 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
951 $face->{data} = $meta;
952
953 # rely on strict ordering here and also on later fetch
954 DC::DB::put res_data => $face->{name} => $data, sub { };
955 DC::DB::put res_meta => $face->{name} => $meta, sub { };
956 }
957
958 $face->{data} = $self->{json_coder}->decode ($face->{data});
959 ::add_license ($face);
960 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
961 if $changed;
962
963 if ($face->{type} == 3) { # FT_MUSIC
964 &::audio_music_push ($facenum);
965 } elsif ($face->{type} == 5) { # FT_SOUND
966 &::audio_sound_push ($facenum);
967 }
968
969 } else {
970 # flat resource case, FT_RSRC
971 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
972 if $changed;
973 }
974
975 if (my $cbs = $self->{face_cb}{$facenum}) {
976 $_->($face, $changed) for @$cbs;
977 }
978}
979
980sub smooth_update {
981 my ($self, $facenum, $face) = @_;
982
983 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
984}
985
986sub have_tile {
546 my ($self, $id, $data) = @_; 987 my ($self, $tile, $data) = @_;
547 988
548 $self->{texture}[$id] ||= do { 989 return unless $self->{map};
549 my $tex =
550 new_from_image CFClient::Texture
551 $data, minify => 1, mipmap => 1;
552 990
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 991 my $tex = $self->{texture}[$tile] ||=
554 $self->{map_widget}->update; 992 new DC::Texture
993 tile => $tile,
994 image => $data, delete_image => 1,
995 minify => 1;
555 996
556 $tex 997 if (my $cbs = delete $self->{tile_cb}{$tile}) {
998 $_->($tex) for @$cbs;
557 }; 999 }
1000}
1001
1002# call in non-void context registers a temporary
1003# hook with handle, otherwise its permanent
1004sub on_face_change {
1005 my ($self, $num, $cb) = @_;
1006
1007 push @{$self->{face_cb}{$num}}, $cb;
1008
1009 defined wantarray
1010 ? Guard::guard {
1011 @{$self->{face_cb}{$num}}
1012 = grep $_ != $cb,
1013 @{$self->{face_cb}{$num}};
1014 }
1015 : ()
1016}
1017
1018# call in non-void context registers a temporary
1019# hook with handle, otherwise its permanent
1020sub register_face_handler {
1021 my ($self, $num, $cb) = @_;
1022
1023 return unless $num;
1024
1025 # invoke if available right now
1026 $cb->($self->{face}[$num], 0)
1027 unless exists $self->{face}[$num]{loading};
1028
1029 # future changes
1030 $self->on_face_change ($num => $cb)
558} 1031}
559 1032
560sub sound_play { 1033sub sound_play {
561 my ($self, $x, $y, $soundnum, $type) = @_; 1034 my ($self, $type, $face, $dx, $dy, $vol) = @_;
562 1035
563 $self->{sound_play}->($x, $y, $soundnum, $type); 1036 &::audio_sound_play ($face, $dx, $dy, $vol)
1037 unless $type & 1; # odd types are silent for future expansion
564} 1038}
565 1039
566my $LAST_QUERY; # server is stupid, stupid, stupid 1040my $LAST_QUERY; # server is stupid, stupid, stupid
567 1041
568sub query { 1042sub query {
… …
572 $LAST_QUERY = $prompt; 1046 $LAST_QUERY = $prompt;
573 1047
574 $self->{query}-> ($self, $flags, $prompt); 1048 $self->{query}-> ($self, $flags, $prompt);
575} 1049}
576 1050
577sub drawinfo { 1051sub sanitise_xml($) {
578 my ($self, $color, $text) = @_; 1052 local $_ = shift;
579 1053
580 my @color = ( 1054 # we now weed out all tags we do not support
1055 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1056 }{
1057 "&lt;"
1058 }gex;
1059
1060 # now all entities
1061 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1062
1063 # handle some elements
1064 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1065 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1066
1067 s/\s+$//;
1068
1069 $_
1070}
1071
1072our %NAME_TO_COLOR = (
1073 black => 0,
1074 white => 1,
1075 darkblue => 2,
1076 red => 3,
1077 orange => 4,
1078 lightblue => 5,
1079 darkorange => 6,
1080 green => 7,
1081 darkgreen => 8,
1082 grey => 9,
1083 brown => 10,
1084 yellow => 11,
1085 tan => 12,
1086);
1087
1088our @CF_COLOR = (
581 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1089 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
582 [1.00, 1.00, 1.00], 1090 [1.00, 1.00, 1.00],
583 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1091 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
584 [1.00, 0.00, 0.00], 1092 [1.00, 0.00, 0.00],
585 [1.00, 0.54, 0.00], 1093 [1.00, 0.54, 0.00],
586 [0.11, 0.56, 1.00], 1094 [0.11, 0.56, 1.00],
587 [0.93, 0.46, 0.00], 1095 [0.93, 0.46, 0.00],
588 [0.18, 0.54, 0.34], 1096 [0.18, 0.54, 0.34],
589 [0.56, 0.73, 0.56], 1097 [0.56, 0.73, 0.56],
590 [0.80, 0.80, 0.80], 1098 [0.80, 0.80, 0.80],
591 [0.75, 0.61, 0.20], 1099 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 1100 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 1101 [0.74, 0.65, 0.41],
594 ); 1102);
595 1103
1104sub msg {
1105 my ($self, $color, $type, $text, @extra) = @_;
1106
1107 $text = sanitise_xml $text;
1108
1109 if (my $cb = $self->{cb_msg}{$type}) {
1110 $_->($self, $color, $type, $text, @extra) for values %$cb;
1111 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1112 $type =~ s/-/_/g;
1113 $self->{$type} = $text;
1114 } else {
596 $self->logprint ("info: ", $text); 1115 $self->logprint ("msg: ", $text);
1116 return if $color < 0; # negative color == ignore if not understood
597 1117
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1118 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
599 1119
600 # try to create single paragraphs of multiple lines sent by the server 1120 ## try to create single paragraphs of multiple lines sent by the server
1121 # no longer neecssary with TRT servers
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1122 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
602 1123
603 $text = CFClient::asxml $text; 1124 ::message ({
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1125 fg => $fg,
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1126 markup => $text,
1127 type => $type,
1128 extra => [@extra],
1129 color_flags => $color, #d# ugly, kill
1130 });
606 1131
607 $self->{logview}->add_paragraph ($color[$color], $_) 1132# $color &= ~NDI_CLEAR; # only clear once for multiline messages
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 1133# # actually, this is an ugly design. _we_ should control the channels,
609 $self->{logview}->scroll_to_bottom; 1134# # not some random other widget, as the channels are clearly protocol-specific.
1135# # then we could also react to flags such as CLEAR without resorting to
1136# # hacks such as color_flags, above.
610 1137
611 $self->{statusbox}->add ($text, 1138 $self->{statusbox}->add ($text,
612 group => $text, 1139 group => $text,
613 fg => $color[$color], 1140 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 1141 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 1142 tooltip_font => $::FONT_FIXED,
616 ); 1143 ) if $type eq "info";
617} 1144 }
618
619sub drawextinfo {
620 my ($self, $color, $type, $subtype, $message) = @_;
621
622 $self->drawinfo ($color, $message);
623} 1145}
624 1146
625sub spell_add { 1147sub spell_add {
626 my ($self, $spell) = @_; 1148 my ($self, $spell) = @_;
627 1149
628 # try to create single paragraphs of multiple lines sent by the server 1150 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1151 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 1152 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 1153 $spell->{message} ||= "Server did not provide a description for this spell.";
632 1154
633 $::SPELL_PAGE->add_spell ($spell); 1155 $::SPELL_LIST->add_spell ($spell);
634 1156
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 1157 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
636 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 1158 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
637} 1159}
638 1160
639sub spell_delete { 1161sub spell_delete {
640 my ($self, $spell) = @_; 1162 my ($self, $spell) = @_;
641 1163
642 $::SPELL_PAGE->remove_spell ($spell); 1164 $::SPELL_LIST->remove_spell ($spell);
1165}
1166
1167sub setup {
1168 my ($self, $setup) = @_;
1169
1170 $self->{map_widget}->set_tilesize ($self->{tilesize});
1171 $::MAP->resize ($self->{mapw}, $self->{maph});
643} 1172}
644 1173
645sub addme_success { 1174sub addme_success {
646 my ($self) = @_; 1175 my ($self) = @_;
647 1176
648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
649 my ($pom) = @_;
650
651 my %skill_help; 1177 my %skill_help;
652 1178
653 for my $head2 ($pom->head1->[3]->head2) { 1179 for my $node (DC::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 1180 my (undef, @par) = DC::Pod::section_of $node;
655 } 1181 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
656
657 \%skill_help
658 }; 1182 };
659 1183
660 for my $skill (values %{$self->{skill_info}}) { 1184 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 1185 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 1186 (DC::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 1187 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 1188 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 1189 (DC::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 1190 . $skill_help{$skill});
667 } 1191 }
668} 1192}
669 1193
670sub eof { 1194sub eof {
671 my ($self) = @_; 1195 my ($self) = @_;
… …
673 $self->{map_widget}->clr_commands; 1197 $self->{map_widget}->clr_commands;
674 1198
675 ::stop_game (); 1199 ::stop_game ();
676} 1200}
677 1201
678sub image_info {
679 my ($self, $numfaces) = @_;
680
681 $self->{num_faces} = $numfaces;
682 $self->{face_prefetch} = [1 .. $numfaces];
683 $self->face_prefetch;
684}
685
686sub face_prefetch {
687 my ($self) = @_;
688
689 return unless $::CFG->{face_prefetch};
690
691 if ($self->{num_faces}) {
692 return if @{ $self->{send_queue} || [] };
693 my $todo = @{ $self->{face_prefetch} }
694 or return;
695
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697
698 $self->send ("requestinfo image_sums $face $face");
699
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info");
704
705 $self->{num_faces} = 0;
706
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 }
710}
711
712sub update_floorbox { 1202sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1203 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 1204 return unless $::CONN;
715 1205
716 $::FLOORBOX->clear; 1206 $::FLOORBOX->clear;
717 1207
1208 my @add;
1209
718 my $row; 1210 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1211 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1212 next if $_->{tag} & 0x80000000;
720 if ($row < 6) { 1213 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 1214 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 1215 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 1216 DC::Item::update_widgets $_;
724 1217
1218 push @add,
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1219 0, $row, $_->{face_widget},
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1220 1, $row, $_->{desc_widget};
727 1221
728 $row++; 1222 $row++;
729 } else { 1223 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1224 push @add, 1, $row, new DC::UI::Button
731 text => "More...", 1225 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1226 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 1227 ;
734 last; 1228 last;
735 } 1229 }
736 } 1230 }
737 if ($::CONN->{open_container}) { 1231 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 1232 push @add, 1, $row++, new DC::UI::Button
739 text => "Close container", 1233 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1234 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 1235 ;
742 } 1236 }
1237
1238 $::FLOORBOX->add_at (@add);
743 }); 1239 });
744 1240
745 $::WANT_REFRESH++; 1241 $::WANT_REFRESH = 1;
746} 1242}
747 1243
748sub set_opencont { 1244sub set_opencont {
749 my ($conn, $tag, $name) = @_; 1245 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 1246 $conn->{open_container} = $tag;
751 update_floorbox; 1247 update_floorbox;
752 1248
753 $::INV_RIGHT_HB->clear (); 1249 $::INVR_HB->clear;
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1250 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
755 1251
756 if ($tag != 0) { # Floor isn't closable, is it? 1252 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1253 $::INVR_HB->add (new DC::UI::Button
758 text => "Close container", 1254 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 1255 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 1256 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1257 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 1258 if $tag != 0;
763 #if $CONN->{open_container} != 0;
764 0 1259 0
765 }, 1260 },
766 ); 1261 );
767 } 1262 }
768 1263
… …
770} 1265}
771 1266
772sub update_containers { 1267sub update_containers {
773 my ($self) = @_; 1268 my ($self) = @_;
774 1269
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1270 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 1271 my $todo = delete $self->{update_container}
777 or return; 1272 or return;
778 1273
779 for my $tag (keys %$todo) { 1274 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1275 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
815} 1310}
816 1311
817sub item_update { 1312sub item_update {
818 my ($self, $item) = @_; 1313 my ($self, $item) = @_;
819 1314
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1315 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
821 1316
822 CFClient::Item::update_widgets $item; 1317 DC::Item::update_widgets $item;
823 1318
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1319 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 1320 set_opencont ($::CONN, 0, "Floor");
826 1321
827 } elsif ($item->{flags} & F_OPEN) { 1322 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1323 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
829 1324
830 } else { 1325 } else {
831 $self->{update_container}{$item->{container}}++; 1326 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 1327 $self->update_containers;
833 } 1328 }
… …
844 1339
845 my $weight = .001 * $self->{player}{weight}; 1340 my $weight = .001 * $self->{player}{weight};
846 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1341 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
847 1342
848 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1343 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
849 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1344 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
850 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1345 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
851} 1346}
852 1347
853sub update_server_info { 1348sub update_server_info {
854 my ($self) = @_; 1349 my ($self) = @_;
… …
858 $::SERVER_INFO->set_markup ( 1353 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 1354 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 1355 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1356 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1357 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1358 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1359 . "editing support $yesno[!!$self->{editor_support}]\n"
1360 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1361 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1362 . "client support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1363 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 1364 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 1365 );
1366
867} 1367}
868 1368
869sub logged_in { 1369sub logged_in {
870 my ($self) = @_; 1370 my ($self) = @_;
871 1371
872 $self->send_ext_req (cfplus_support => "1", sub { 1372 $self->send_ext_req (cfplus_support => version => 2, sub {
1373 my (%msg) = @_;
1374
873 $self->{cfplus_ext} = $_[0]; 1375 $self->{cfplus_ext} = $msg{version};
874 $self->update_server_info; 1376 $self->update_server_info;
1377
1378 if ($self->{cfplus_ext} >= 2) {
1379 $self->send_ext_req ("editor_support", sub {
1380 $self->{editor_support} = { @_ };
1381 $self->update_server_info;
1382
1383 0
1384 });
1385 }
1386
1387 0
875 }); 1388 });
876 1389
877 $self->update_server_info; 1390 $self->update_server_info;
878 1391
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 1392 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
880 $self->send_command ("output-count $::CFG->{output_count}");
881 $self->send_command ("pickup $::CFG->{pickup}"); 1393 $self->send_pickup ($::CFG->{pickup});
1394
1395 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1396 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
882} 1397}
883 1398
884sub lookat { 1399sub lookat {
885 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
886 1401
887 if ($self->{cfplus_ext}) { 1402 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 1403 $self->send_ext_req (lookat => $x, $y, sub {
889 my %res = split /\x00/, $_[0]; 1404 my (%msg) = @_;
890 1405
891 if (exists $res{npc_dialog}) { 1406 if (exists $msg{npc_dialog}) {
892 # start npc chat dialog 1407 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 1408 $self->{npc_dialog} = new DC::NPCDialog::
894 dx => $x, 1409 token => $msg{npc_dialog},
895 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 1410 title => "$msg{npc_dialog}[0] (NPC)",
897 conn => $self, 1411 conn => $self,
898 ; 1412 ;
899 } 1413 }
900 }); 1414 });
901 } 1415 }
… …
904} 1418}
905 1419
906sub destroy { 1420sub destroy {
907 my ($self) = @_; 1421 my ($self) = @_;
908 1422
909 $self->{npc_dialog}->destroy 1423 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 1424 if $self->{npc_dialog};
911 1425
912 $self->SUPER::destroy; 1426 $self->SUPER::destroy;
913}
914 1427
1428 %$self = ();
1429}
1430
915package CFClient::NPCDialog; 1431package DC::NPCDialog;
916 1432
917our @ISA = 'CFClient::UI::FancyFrame'; 1433our @ISA = 'DC::UI::Toplevel';
918 1434
919sub new { 1435sub new {
920 my $class = shift; 1436 my $class = shift;
921 1437
922 my $self = $class->SUPER::new ( 1438 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 1445 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 1446 has_close_button => 1,
931 @_, 1447 @_,
932 ); 1448 );
933 1449
934 Scalar::Util::weaken (my $this = $self); 1450 DC::weaken (my $this = $self);
935 1451
936 $self->connect (delete => sub { $this->destroy; 1 }); 1452 $self->connect (delete => sub { $this->destroy; 1 });
937 1453
938 # better use a pane... 1454 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 1455 $self->add (my $hbox = new DC::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1456 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
941 1457
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 1458 $hbox->add (my $vbox = new DC::UI::VBox);
943 1459
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1460 $vbox->add (new DC::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1461 $vbox->add ($self->{entry} = new DC::UI::Entry
946 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1462 tooltip => "#npc_message_entry",
947 . "Sometimes you have to tell an NPC something you cannot find out during "
948 . "a normal conversation (such as a password). In those cases you have to use "
949 . "this text entry. You can also enter responses manually instead of using the response "
950 . "buttons below.",
951 on_activate => sub { 1463 on_activate => sub {
952 my ($entry, $text) = @_; 1464 my ($entry, $text) = @_;
953 1465
954 return unless $text =~ /\S/; 1466 return unless $text =~ /\S/;
955 1467
… …
958 1470
959 0 1471 0
960 }, 1472 },
961 ); 1473 );
962 1474
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1475 $vbox->add ($self->{options} = new DC::UI::VBox);
964 1476
965 $self->{bye_button} = new CFClient::UI::Button 1477 $self->{bye_button} = new DC::UI::Button
966 text => "Bye (close)", 1478 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1479 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1480 on_activate => sub { $this->destroy; 1 },
969 ; 1481 ;
970 1482
971 $self->update_options; 1483 $self->update_options;
972 1484
973 $self->{token} = $self->{conn}->ext_token; 1485 $self->{id} = "npc-channel-" . $self->{conn}->token;
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1486 $self->{conn}->connect_ext ($self->{id} => sub {
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1487 $this->feed (@_) if $this;
1488 });
1489
1490 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
976 1491
977 $self->{entry}->grab_focus; 1492 $self->{entry}->grab_focus;
978 1493
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1494 $self->{textview}->add_paragraph ({
1495 fg => [1, 1, 0, 1],
1496 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1497 });
980 1498
981 $self->show; 1499 $self->show;
982 $self 1500 $self
983}; 1501};
984 1502
985sub update_options { 1503sub update_options {
986 my ($self) = @_; 1504 my ($self) = @_;
987 1505
988 Scalar::Util::weaken $self; 1506 DC::weaken $self;
989 1507
990 $self->{options}->clear; 1508 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1509 $self->{options}->add ($self->{bye_button});
992 1510
993 for my $kw (sort keys %{ $self->{kw} }) { 1511 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1512 $self->{options}->add (new DC::UI::Button
995 text => $kw, 1513 text => $kw,
996 on_activate => sub { 1514 on_activate => sub {
997 $self->send ($kw); 1515 $self->send ($kw);
998 0 1516 0
999 }, 1517 },
1000 ); 1518 );
1001 } 1519 }
1002} 1520}
1003 1521
1004sub feed { 1522sub feed {
1005 my ($self, $data) = @_; 1523 my ($self, $type, @arg) = @_;
1006 1524
1007 Scalar::Util::weaken $self; 1525 DC::weaken $self;
1008 1526
1009 my ($type, $msg) = split / /, $data, 2;
1010
1011 if ($type eq "msg") { 1527 if ($type eq "update") {
1012 my ($msg, @kw) = split /\x00/, $msg; 1528 my (%info) = @arg;
1013 1529
1014 utf8::decode $_ for ($msg, @kw); 1530 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1531 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1015 1532
1016 $self->{kw}{$_} = 1 for @kw; 1533 if (exists $info{msg}) {
1017 1534 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1018 $msg = "\n" . CFClient::UI::asxml $msg;
1019 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1535 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1020 my @link; 1536 my @link;
1021 $msg =~ s{ 1537 $text =~ s{
1022 ($match) 1538 ($match)
1023 }{ 1539 }{
1024 my $kw = $1; 1540 my $kw = $1;
1025 1541
1026 push @link, new CFClient::UI::Label 1542 push @link, new DC::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1543 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1544 can_hover => 1,
1029 can_events => 1, 1545 can_events => 1,
1030 padding_x => 0, 1546 padding_x => 0,
1031 padding_y => 0, 1547 padding_y => 0,
1032 on_button_up => sub { 1548 on_button_up => sub {
1033 $self->send ($kw); 1549 $self->send ($kw);
1034 }; 1550 };
1035 1551
1036 chr 0xfffc 1552 "\x{fffc}"
1037 }giex; 1553 }giex;
1038 1554
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1555 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1556 $self->{textview}->scroll_to_bottom;
1557 }
1558
1041 $self->update_options; 1559 $self->update_options;
1042 } else { 1560 } else {
1043 $self->destroy; 1561 $self->destroy;
1044 } 1562 }
1045 1563
… …
1047} 1565}
1048 1566
1049sub send { 1567sub send {
1050 my ($self, $msg) = @_; 1568 my ($self, $msg) = @_;
1051 1569
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1570 $self->{textview}->add_paragraph ({
1571 markup =>
1572 "\n<span foreground='#ffff00'><b>"
1573 . (DC::asxml $msg)
1574 . "</b></span>"
1575 });
1053 $self->{textview}->scroll_to_bottom; 1576 $self->{textview}->scroll_to_bottom;
1054 1577
1055 utf8::encode $msg;
1056 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1578 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1057} 1579}
1058 1580
1059sub destroy { 1581sub destroy {
1060 my ($self) = @_; 1582 my ($self) = @_;
1061 1583
1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1584 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1063 1585
1586 if ($self->{conn}) {
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1587 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1065 delete $self->{conn}{npc_dialog}; 1588 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token}); 1589 $self->{conn}->disconnect_ext ($self->{id});
1590 }
1067 1591
1068 $self->SUPER::destroy; 1592 $self->SUPER::destroy;
1069} 1593}
1070 1594
10711; 15951
1596

Diff Legend

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