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.229 by root, Mon Nov 26 13:02:28 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines