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.41 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.159 by root, Tue Aug 21 17:54:02 2007 UTC

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

Diff Legend

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