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.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.197 by root, Tue May 20 02:47:21 2008 UTC

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

Diff Legend

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