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.36 by root, Thu Jun 15 15:33:58 2006 UTC vs.
Revision 1.162 by root, Wed Aug 22 21:14:06 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 ($self, $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 ($self, $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 {
190 my ($self, $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 ($self, %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 ($self, $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 ($self, $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 ($self, $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 ($self, $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}
87 314
315sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_;
88 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);
89 383
90sub stats_update { 384sub stats_update {
91 my ($self, $stats) = @_; 385 my ($self, $stats) = @_;
92 386
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 387 my $prev = $self->{prev_stats} || { };
94 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;
95 $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);
96 if exists $self->{prev_exp} && $diff;
97 $self->{prev_exp} = $exp;
98 } 400 }
99 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
100 ::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 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
484 map [$_, $self->{skill_info}{$_}],
485 grep exists $stats->{$_},
486 @skills;
487
488 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
489 $self->{stat_order} = join ",", map $_->[0], @order;
490
491 $sktbl->clear;
492
493 my $sw = $self->{skillwid}{""} ||= [
494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
502 ];
503
504 my @add = @$sw;
505
506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
507
508 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
509 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
510
511 my ($x, $y) = (0, 1);
512 for (@order) {
513 my ($idx, $name) = @$_;
514
515 my $spell_cb = sub {
516 my ($widget, $ev) = @_;
517
518 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14;
524 (new CFPlus::UI::Menu
525 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
527 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
528 ],
529 )->popup ($ev);
530 } else {
531 return 0;
532 }
533
534 1
535 };
536
537 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp
539 (new CFPlus::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541
542 # level
543 (new CFPlus::UI::Label
544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545
546 # progress
547 (new CFPlus::UI::ExperienceProgress),
548
549 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ];
553
554 push @add,
555 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1],
557 $x * 4 + 2, $y, $sw->[2],
558 $x * 4 + 3, $y, $sw->[3],
559 ;
560
561 $x++ and ($x, $y) = (0, $y + 1);
562 }
563
564 $sktbl->add_at (@add);
565 }
566
567 for (grep exists $stats->{$_}, @skills) {
568 next if $prev->{$_} == $stats->{$_};
569
570 my $sw = $self->{skillwid}{$_};
571 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
572 $sw->[1]->set_text ($stats->{$_}[0] * 1);
573 $sw->[2]->set_value (@{$stats->{$_}});
574 }
575}
576
577sub macro_send {
578 my ($self, $macro) = @_;
579
580 for my $cmd (@{ $macro->{action} }) {
581 $self->send_command ($cmd);
582 }
101} 583}
102 584
103sub user_send { 585sub user_send {
104 my ($self, $command) = @_; 586 my ($self, $command) = @_;
105 587
588 $self->{record}->($command)
106 if ($self->{record}) { 589 if $self->{record};
107 push @{$self->{record}}, $command;
108 }
109 590
110 $self->logprint ("send: ", $command); 591 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 592 $self->send_command ($command);
112 ::status $command; 593 ::status ($command);
113} 594}
114 595
115sub start_record { 596sub record {
116 my ($self) = @_; 597 my ($self, $cb) = @_;
117 598
118 $self->{record} = []; 599 $self->{record} = $cb;
119}
120
121sub stop_record {
122 my ($self) = @_;
123 return delete $self->{record};
124} 600}
125 601
126sub map_scroll { 602sub map_scroll {
127 my ($self, $dx, $dy) = @_; 603 my ($self, $dx, $dy) = @_;
128 604
… …
130} 606}
131 607
132sub feed_map1a { 608sub feed_map1a {
133 my ($self, $data) = @_; 609 my ($self, $data) = @_;
134 610
135 $self->{map}->map1a_update ($data); 611 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
612 my $delay;
613
614 for my $tile (@$missing) {
615 next if $self->{delay}{$tile};
616
617 $delay = 1;
618
619 if (my $tex = $::CONN->{texture}[$tile]) {
620 $tex->upload;
621 } else {
622 $self->{delay}{$tile} = 1;
623
624 # we assume the face is in-flight and will eventually come
625 push @{$self->{tile_cb}{$tile}}, sub {
626 delete $self->{delay}{$tile};
627 $_[0]->upload;
628 };
629 }
630 }
631
632 if ($delay) {
633 # delay the map drawing a tiny bit in the hope of getting the missing fetched
634 Event->timer (after => 0.03, cb => sub {
635 $_[0]->w->cancel;
636 $self->{map_widget}->update
637 if $self->{map_widget};
638 });
639 } else {
136 $self->{map_widget}->update; 640 $self->{map_widget}->update;
641 }
137} 642}
138 643
139sub magicmap { 644sub magicmap {
140 my ($self, $w, $h, $x, $y, $data) = @_; 645 my ($self, $w, $h, $x, $y, $data) = @_;
141 646
… …
148 my $map_info = delete $self->{map_info} 653 my $map_info = delete $self->{map_info}
149 or return; 654 or return;
150 655
151 my ($hash, $x, $y, $w, $h) = @$map_info; 656 my ($hash, $x, $y, $w, $h) = @$map_info;
152 657
153 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 658 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
154 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 659 $self->{map_cache_new}{$hash} = \$data;
155 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 660 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
156} 661}
157 662
158sub map_clear { 663sub map_clear {
159 my ($self) = @_; 664 my ($self) = @_;
160 665
161 $self->flush_map; 666 $self->flush_map;
162 delete $self->{neigh_map}; 667 delete $self->{neigh_map};
163 668
164 $self->{map}->clear; 669 $self->{map}->clear;
670 delete $self->{map_widget}{magicmap};
165} 671}
166 672
673sub bg_fetch {
674 my ($self) = @_;
675
676 my $tile;
677
678 do {
679 $tile = pop @{$self->{bg_fetch}}
680 or return;
681 } while $self->{texture}[$tile];
682
683 CFPlus::DB::get tilecache => $tile, sub {
684 my ($data) = @_;
685
686 return unless $self->{map}; # stop when destroyed
687
688 if (defined $data) {
689 $self->have_tile ($tile, $data);
690 $self->{texture}[$tile]->upload;
691 }
692
693 $self->bg_fetch;
694 };
695}
167 696
168sub load_map($$$) { 697sub load_map($$$) {
169 my ($self, $hash, $x, $y) = @_; 698 my ($self, $hash, $x, $y) = @_;
170 699
171 if (defined (my $data = $self->{mapcache}->get ($hash))) { 700 my $gen = $self->{map_change_gen};
701
702 my $cb = sub {
703 return unless $gen == $self->{map_change_gen};
704
705 my ($data) = @_;
706
707 if (defined $data) {
708 $self->{map_cache_new}{$hash} = \$data;
709
172 $data = Compress::LZF::decompress $data; 710 my $data = Compress::LZF::decompress $data;
173 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
174 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
175 my $data = $self->{tilecache}->get ($id)
176 or next;
177 711
178 $self->set_texture ($id => $data); 712 my $inprogress = @{ $self->{bg_fetch} || [] };
713 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
714 $self->bg_fetch unless $inprogress;
179 } 715 }
716 };
717
718 if (my $rdata = $self->{map_cache_old}{$hash}) {
719 $cb->($$rdata);
720 } else {
721 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
180 } 722 }
181} 723}
182 724
183# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 725# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
184# (server resource,s latency, bandwidth), so this hack is warranted. 726# (server resource,s latency, bandwidth), so this hack is warranted.
… …
249 791
250 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 792 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
251 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 793 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
252 794
253 } else { 795 } else {
796 my $gen = $self->{map_change_gen};
254 $self->send_mapinfo ("spatial $path$tile", sub { 797 $self->send_mapinfo ("spatial $path$tile", sub {
798 return unless $gen == $self->{map_change_gen};
799
255 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 800 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
256 801
257 return if $mode ne "spatial"; 802 return if $mode ne "spatial";
258 803
259 $x += $self->{map}->ox; 804 $x += $self->{map}->ox;
… …
273 818
274sub map_change { 819sub map_change {
275 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 820 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
276 821
277 $self->flush_map; 822 $self->flush_map;
823
824 ++$self->{map_change_gen};
825 $self->{map_cache_old} = delete $self->{map_cache_new};
278 826
279 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 827 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
280 828
281 my $mapmapw = $self->{mapmap}->{w}; 829 my $mapmapw = $self->{mapmap}->{w};
282 my $mapmaph = $self->{mapmap}->{h}; 830 my $mapmaph = $self->{mapmap}->{h};
… …
299 $self->load_map ($hash, $x, $y); 847 $self->load_map ($hash, $x, $y);
300 $self->flood_fill (0, 0, 0, "", $hash, $flags); 848 $self->flood_fill (0, 0, 0, "", $hash, $flags);
301} 849}
302 850
303sub face_find { 851sub face_find {
852 my ($self, $facenum, $face, $cb) = @_;
853
854 if ($face->{type} == 0) { # FT_FACE
855 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
856
857 $face->{id} = $id;
858 $self->{map}->set_tileid ($facenum => $id);
859
860 CFPlus::DB::get tilecache => $id, $cb;
861
862 } elsif ($face->{type} & 1) { # with metadata
863 CFPlus::DB::get res_meta => $face->{name}, $cb;
864
865 } else { # no metadata
866 CFPlus::DB::get res_data => $face->{name}, $cb;
867 }
868}
869
870sub face_update {
871 my ($self, $facenum, $face, $changed) = @_;
872
873 if ($face->{type} == 0) {
874 # image, FT_FACE
875 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
876 if $changed;
877
878 $self->have_tile ($face->{id}, delete $face->{data});
879
880 } elsif ($face->{type} & 1) {
881 # split metadata case, FT_MUSIC, FT_SOUND
882 if ($changed) { # new data
883 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
884 $face->{data} = $meta;
885
886 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
887 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
888 }
889
890 $face->{data} = $self->{json_coder}->decode ($face->{data});
891
892 ::add_license ($face);
893
894 if ($face->{type} == 3) { # FT_MUSIC
895 ::message ({ markup => "downloaded song #$facenum" })
896 if $changed;
897
898 &::audio_music_push ($facenum);
899 } elsif ($face->{type} == 5) { # FT_SOUND
900 ::message ({ markup => "downloaded sound #$facenum" })
901 if $changed;
902
903 &::audio_sound_push ($facenum);
904 }
905
906 } else {
907 # flat resource case, FT_RSRC
908 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
909 if $changed;
910 }
911
912 if (my $cbs = $self->{face_cb}{$facenum}) {
913 $_->($face, $changed) for @$cbs;
914 }
915}
916
917sub smooth_update {
304 my ($self, $facenum, $face) = @_; 918 my ($self, $facenum, $face) = @_;
305 919
306 my $hash = "$face->{chksum},$face->{name}"; 920 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
921}
307 922
308 my $id = $self->{facemap}->get ($hash); 923sub have_tile {
924 my ($self, $tile, $data) = @_;
309 925
310 unless ($id) { 926 return unless $self->{map};
311 # create new id for face
312 # I love transactions
313 for (1..100) {
314 my $txn = $CFClient::DB_ENV->txn_begin;
315 my $status = $self->{facemap}->db_get (id => $id);
316 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
317 $id = ($id || 64) + 1;
318 if ($self->{facemap}->put (id => $id) == 0
319 && $self->{facemap}->put ($hash => $id) == 0) {
320 $txn->txn_commit;
321 927
322 goto gotid; 928 my $tex = $self->{texture}[$tile] ||=
323 } 929 new CFPlus::Texture
930 tile => $tile,
931 image => $data, delete_image => 1,
932 minify => 1, mipmap => 1;
933
934 if (my $cbs = delete $self->{tile_cb}{$tile}) {
935 $_->($tex) for @$cbs;
936 }
937}
938
939# call in non-void context registers a temporary
940# hook with handle, otherwise its permanent
941sub on_face_change {
942 my ($self, $num, $cb) = @_;
943
944 push @{$self->{face_cb}{$num}}, $cb;
945
946 defined wantarray
947 ? CFPlus::guard {
948 @{$self->{face_cb}{$num}}
949 = grep $_ != $cb,
950 @{$self->{face_cb}{$num}};
324 } 951 }
325 $txn->txn_abort; 952 : ()
326 }
327
328 CFClient::fatal "maximum number of transaction retries reached - database problems?";
329 }
330
331gotid:
332 $face->{id} = $id;
333 $self->{map}->set_face ($facenum => $id);
334 $self->{faceid}[$facenum] = $id;#d#
335
336 my $face = $self->{tilecache}->get ($id);
337
338 if ($face) {
339 #$self->face_prefetch;
340 $face
341 } else {
342 my $tex = $self->{noface};
343 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
344 undef
345 };
346} 953}
347 954
348sub face_update { 955# call in non-void context registers a temporary
956# hook with handle, otherwise its permanent
957sub register_face_handler {
349 my ($self, $facenum, $face) = @_; 958 my ($self, $num, $cb) = @_;
350 959
351 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 960 return unless $num;
352 961
353 $self->set_texture ($face->{id} => delete $face->{image}); 962 # invoke if available right now
354} 963 $cb->($self->{face}[$num], 0)
964 unless exists $self->{face}[$num]{loading};
355 965
356sub set_texture { 966 # future changes
357 my ($self, $id, $data) = @_; 967 $self->on_face_change ($num => $cb)
358
359 $self->{texture}[$id] ||= do {
360 my $tex =
361 new_from_image CFClient::Texture
362 $data, minify => 1, mipmap => 1;
363
364 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
365 $self->{map_widget}->update;
366
367 $tex
368 };
369} 968}
370 969
371sub sound_play { 970sub sound_play {
372 my ($self, $x, $y, $soundnum, $type) = @_; 971 my ($self, $type, $face, $dx, $dy, $vol) = @_;
373 972
374 $self->{sound_play}->($x, $y, $soundnum, $type); 973 &::audio_sound_play ($face, $dx, $dy, $vol)
974 unless $type & 1; # odd types are silent for future expansion
375} 975}
376 976
377my $LAST_QUERY; # server is stupid, stupid, stupid 977my $LAST_QUERY; # server is stupid, stupid, stupid
378 978
379sub query { 979sub query {
… …
383 $LAST_QUERY = $prompt; 983 $LAST_QUERY = $prompt;
384 984
385 $self->{query}-> ($self, $flags, $prompt); 985 $self->{query}-> ($self, $flags, $prompt);
386} 986}
387 987
388sub drawinfo { 988sub sanitise_xml($) {
389 my ($self, $color, $text) = @_; 989 local $_ = shift;
390 990
391 my @color = ( 991 # we now weed out all tags we do not support
992 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
993 # now all entities
994 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
995
996 # handle some elements
997 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
998 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
999
1000 $_
1001}
1002
1003our %NAME_TO_COLOR = (
1004 black => 0,
1005 white => 1,
1006 darkblue => 2,
1007 red => 3,
1008 orange => 4,
1009 lightblue => 5,
1010 darkorange => 6,
1011 green => 7,
1012 darkgreen => 8,
1013 grey => 9,
1014 brown => 10,
1015 yellow => 11,
1016 tan => 12,
1017);
1018
1019our @CF_COLOR = (
392 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1020 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
393 [1.00, 1.00, 1.00], 1021 [1.00, 1.00, 1.00],
394 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1022 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
395 [1.00, 0.00, 0.00], 1023 [1.00, 0.00, 0.00],
396 [1.00, 0.54, 0.00], 1024 [1.00, 0.54, 0.00],
397 [0.11, 0.56, 1.00], 1025 [0.11, 0.56, 1.00],
398 [0.93, 0.46, 0.00], 1026 [0.93, 0.46, 0.00],
399 [0.18, 0.54, 0.34], 1027 [0.18, 0.54, 0.34],
400 [0.56, 0.73, 0.56], 1028 [0.56, 0.73, 0.56],
401 [0.80, 0.80, 0.80], 1029 [0.80, 0.80, 0.80],
402 [0.55, 0.41, 0.13], 1030 [0.75, 0.61, 0.20],
403 [0.99, 0.77, 0.26], 1031 [0.99, 0.77, 0.26],
404 [0.74, 0.65, 0.41], 1032 [0.74, 0.65, 0.41],
405 ); 1033);
406 1034
1035sub msg {
1036 my ($self, $color, $type, $text, @extra) = @_;
1037
1038 $text = sanitise_xml $text;
1039
1040 if (my $cb = $self->{cb_msg}{$type}) {
1041 $_->($self, $color, $type, $text, @extra) for values %$cb;
1042 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1043 $type =~ s/-/_/g;
1044 $self->{$type} = $text;
1045 } else {
407 $self->logprint ("info: ", $text); 1046 $self->logprint ("msg: ", $text);
1047 return if $color < 0; # negative color == ignore if not understood
408 1048
409 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1049 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
410 1050
411 # try to create single paragraphs of multiple lines sent by the server 1051 ## try to create single paragraphs of multiple lines sent by the server
1052 # no longer neecssary with TRT servers
412 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1053 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
413 1054
414 $text = CFClient::UI::Label::escape $text; 1055 ::message ({
415 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1056 fg => $fg,
416 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1057 markup => $_,
1058 type => $type,
1059 extra => [@extra],
1060 color_flags => $color
1061 }) for split /\n/, $text;
417 1062
418 $self->{logview}->add_paragraph ($color[$color],
419 join "\n", map "$time $_", split /\n/, $text);
420
421 $self->{statusbox}->add ($text, 1063 $self->{statusbox}->add ($text,
422 group => $text, 1064 group => $text,
423 fg => $color[$color], 1065 fg => $fg,
424 timeout => $color >= 2 ? 60 : 10, 1066 timeout => $color >= 2 ? 180 : 10,
425 tooltip_font => $::FONT_FIXED, 1067 tooltip_font => $::FONT_FIXED,
426 ); 1068 );
427} 1069 }
428
429sub drawextinfo {
430 my ($self, $color, $type, $subtype, $message) = @_;
431
432 $self->drawinfo ($color, $message);
433} 1070}
434 1071
435sub spell_add { 1072sub spell_add {
436 my ($self, $spell) = @_; 1073 my ($self, $spell) = @_;
437 1074
438 # try to create single paragraphs of multiple lines sent by the server 1075 # try to create single paragraphs out of the multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1076 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 1077 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 1078 $spell->{message} ||= "Server did not provide a description for this spell.";
442 1079
443 $::SETUP_SPELLS->add_spell ($spell); 1080 $::SPELL_LIST->add_spell ($spell);
444 1081
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 1082 $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}); 1083 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
447} 1084}
448 1085
449sub spell_delete { 1086sub spell_delete {
450 my ($self, $spell) = @_; 1087 my ($self, $spell) = @_;
1088
451 $::SETUP_SPELLS->remove_spell ($spell); 1089 $::SPELL_LIST->remove_spell ($spell);
1090}
1091
1092sub setup {
1093 my ($self, $setup) = @_;
1094
1095 $self->{map_widget}->set_tilesize ($self->{tilesize});
1096 $::MAP->resize ($self->{mapw}, $self->{maph});
452} 1097}
453 1098
454sub addme_success { 1099sub addme_success {
455 my ($self) = @_; 1100 my ($self) = @_;
456 1101
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; 1102 my %skill_help;
461 1103
462 for my $head2 ($pom->head1->[3]->head2) { 1104 for my $node (CFPlus::Pod::find skill_description => "*") {
463 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 1105 my (undef, @par) = CFPlus::Pod::section_of $node;
464 } 1106 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
465
466 \%skill_help
467 }; 1107 };
468 1108
469 for my $skill (values %{$self->{skill_info}}) { 1109 for my $skill (values %{$self->{skill_info}}) {
470 $self->{map_widget}->add_command ("ready_skill $skill", 1110 $self->{map_widget}->add_command ("ready_skill $skill",
471 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 1111 (CFPlus::asxml "Ready the skill '$skill'\n\n")
472 . $skill_help->{$skill}); 1112 . $skill_help{$skill});
473 $self->{map_widget}->add_command ("use_skill $skill", 1113 $self->{map_widget}->add_command ("use_skill $skill",
474 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 1114 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
475 . $skill_help->{$skill}); 1115 . $skill_help{$skill});
476 } 1116 }
477} 1117}
478 1118
479sub eof { 1119sub eof {
480 my ($self) = @_; 1120 my ($self) = @_;
… …
482 $self->{map_widget}->clr_commands; 1122 $self->{map_widget}->clr_commands;
483 1123
484 ::stop_game (); 1124 ::stop_game ();
485} 1125}
486 1126
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 { 1127sub update_floorbox {
522 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1128 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523 return unless $::CONN; 1129 return unless $::CONN;
524 1130
525 $::FLOORBOX->clear; 1131 $::FLOORBOX->clear;
526 1132
1133 my @add;
1134
527 my $row; 1135 my $row;
528 for (@{ $::CONN->{container}{0} }) { 1136 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529 if ($row < 6) { 1137 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 1138 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 1139 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 1140 CFPlus::Item::update_widgets $_;
533 1141
1142 push @add,
534 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1143 0, $row, $_->{face_widget},
535 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1144 1, $row, $_->{desc_widget};
536 1145
537 $row++; 1146 $row++;
538 } else { 1147 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1148 push @add, 1, $row, new CFPlus::UI::Button
540 text => "More...", 1149 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 1150 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 1151 ;
543 last; 1152 last;
544 } 1153 }
545 } 1154 }
1155 if ($::CONN->{open_container}) {
1156 push @add, 1, $row++, new CFPlus::UI::Button
1157 text => "Close container",
1158 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1159 ;
1160 }
1161
1162 $::FLOORBOX->add_at (@add);
546 }); 1163 });
547 1164
548 $::WANT_REFRESH++; 1165 $::WANT_REFRESH->start;
549} 1166}
550 1167
551sub set_opencont { 1168sub set_opencont {
552 my ($conn, $tag, $name) = @_; 1169 my ($conn, $tag, $name) = @_;
553 $conn->{open_container} = $tag; 1170 $conn->{open_container} = $tag;
1171 update_floorbox;
554 1172
555 $::INV_RIGHT_HB->clear (); 1173 $::INVR_HB->clear ();
556 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1174 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
557 1175
558 if ($tag != 0) { # Floor isn't closable, is it? 1176 if ($tag != 0) { # Floor isn't closable, is it?
559 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1177 $::INVR_HB->add (new CFPlus::UI::Button
560 text => "Close container", 1178 text => "Close container",
561 tooltip => "Close the currently open container (if one is open)", 1179 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 1180 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1181 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 1182 if $tag != 0;
565 #if $CONN->{open_container} != 0; 1183 0
566 }, 1184 },
567 ); 1185 );
568 } 1186 }
569 1187
570 $::INVR->set_items ($conn->{container}{$tag}); 1188 $::INVR->set_items ($conn->{container}{$tag});
571} 1189}
572 1190
573sub update_container { 1191sub update_containers {
574 my ($tag) = @_; 1192 my ($self) = @_;
575 1193
576 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 1194 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1195 my $todo = delete $self->{update_container}
1196 or return;
1197
1198 for my $tag (keys %$todo) {
1199 update_floorbox if $tag == 0 or $tag == $self->{open_container};
1200 if ($tag == 0) {
1201 $::INVR->set_items ($self->{container}{0})
577 if $tag == $::CONN->{open_container}; 1202 if $tag == $self->{open_container};
1203 } elsif ($tag == $self->{player}{tag}) {
1204 $::INV->set_items ($self->{container}{$tag})
1205 } else {
1206 $::INVR->set_items ($self->{container}{$tag})
1207 if $tag == $self->{open_container};
1208 }
1209 }
1210 });
578} 1211}
579 1212
580sub container_add { 1213sub container_add {
581 my ($self, $tag, $items) = @_; 1214 my ($self, $tag, $items) = @_;
582 1215
583 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 1216 $self->{update_container}{$tag}++;
584 1217 $self->update_containers;
585 if ($tag == 0) {
586 update_floorbox;
587 update_container (0);
588 } elsif ($tag == $self->{player}{tag}) {
589 $::INV->set_items ($self->{container}{$self->{player}{tag}})
590 } else {
591 update_container ($tag);
592 }
593
594 # $self-<{player}{tag} => player inv
595 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
596} 1218}
597 1219
598sub container_clear { 1220sub container_clear {
599 my ($self, $tag) = @_; 1221 my ($self, $tag) = @_;
600 1222
601 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 1223 $self->{update_container}{$tag}++;
602 1224 $self->update_containers;
603 if ($tag == 0) {
604 update_floorbox;
605 update_container (0);
606 } elsif ($tag == $self->{player}{tag}) {
607 $::INV->set_items ($self->{container}{$tag})
608 } else {
609 update_container ($tag);
610 }
611
612# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
613} 1225}
614 1226
615sub item_delete { 1227sub item_delete {
616 my ($self, @items) = @_; 1228 my ($self, @items) = @_;
617 1229
1230 $self->{update_container}{$_->{container}}++
618 for (@items) { 1231 for @items;
619 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
620
621 if ($_->{container} == 0) {
622 update_floorbox;
623 update_container ($_->{tag});
624 } elsif ($_->{container} == $self->{player}{tag}) {
625 $::INV->set_items ($self->{container}{$self->{player}{tag}})
626 } else {
627 update_container ($_->{container});
628 }
629 } 1232
1233 $self->update_containers;
630} 1234}
631 1235
632sub item_update { 1236sub item_update {
633 my ($self, $item) = @_; 1237 my ($self, $item) = @_;
634 1238
635 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1239 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
636 1240
637 if ($item->{tag} == $self->{player}{tag}) {
638 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
639 return;
640 }
641
642 CFClient::Item::update_widgets $item; 1241 CFPlus::Item::update_widgets $item;
643 1242
644 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1243 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645 set_opencont ($::CONN, 0, "Floor"); 1244 set_opencont ($::CONN, 0, "Floor");
646 1245
647 } elsif ($item->{flags} & F_OPEN) { 1246 } elsif ($item->{flags} & F_OPEN) {
648 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1247 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
1248
649 } else { 1249 } else {
650 if ($item->{container} == 0) { 1250 $self->{update_container}{$item->{container}}++;
651 update_floorbox;
652 update_container (0); 1251 $self->update_containers;
653 } elsif ($item->{container} == $self->{player}{tag}) {
654 $::INV->set_items ($self->{container}{$item->{container}})
655 }
656 } 1252 }
657} 1253}
658 1254
659sub player_update { 1255sub player_update {
660 my ($self, $player) = @_; 1256 my ($self, $player) = @_;
661 1257
1258 $self->update_weight;
1259}
1260
1261sub update_weight {
1262 my ($self) = @_;
1263
1264 my $weight = .001 * $self->{player}{weight};
1265 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1266
662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1267 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1268 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1269 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
663} 1270}
664 1271
665sub update_server_info { 1272sub update_server_info {
666 my ($self) = @_; 1273 my ($self) = @_;
667 1274
… …
670 $::SERVER_INFO->set_markup ( 1277 $::SERVER_INFO->set_markup (
671 "server <tt>$self->{host}:$self->{port}</tt>\n" 1278 "server <tt>$self->{host}:$self->{port}</tt>\n"
672 . "protocol version <tt>$self->{version}</tt>\n" 1279 . "protocol version <tt>$self->{version}</tt>\n"
673 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1280 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
674 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1281 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1282 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1283 . "editing support $yesno[!!$self->{editor_support}]\n"
1284 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1285 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
675 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1286 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
676 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1287 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
677 . "map size $self->{mapw}×$self->{maph}\n" 1288 . "map size $self->{mapw}×$self->{maph}\n"
678 ); 1289 );
1290
679} 1291}
680 1292
681sub logged_in { 1293sub logged_in {
682 my ($self) = @_; 1294 my ($self) = @_;
683 1295
684 $self->send_ext_req (cfplus_support => "1", sub { 1296 $self->send_ext_req (cfplus_support => version => 2, sub {
1297 my (%msg) = @_;
1298
685 $self->{cfplus_ext} = $_[0]; 1299 $self->{cfplus_ext} = $msg{version};
686 $self->update_server_info; 1300 $self->update_server_info;
1301
1302 if ($self->{cfplus_ext} >= 2) {
1303 $self->send_ext_req ("editor_support", sub {
1304 $self->{editor_support} = { @_ };
1305 $self->update_server_info;
1306
1307 0
1308 });
1309 }
1310
1311 0
687 }); 1312 });
688 1313
689 $self->update_server_info; 1314 $self->update_server_info;
690 1315
691 $self->send_command ("output-sync $::CFG->{output_sync}"); 1316 $self->send_command ("output-sync $::CFG->{output_sync}");
692 $self->send_command ("output-count $::CFG->{output_count}"); 1317 $self->send_command ("output-count $::CFG->{output_count}");
1318 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
693 $self->send_command ("pickup $::CFG->{pickup}"); 1319 $self->send_command ("pickup $::CFG->{pickup}");
694} 1320}
695 1321
696sub lookat { 1322sub lookat {
697 my ($self, $x, $y) = @_; 1323 my ($self, $x, $y) = @_;
698 1324
699 if ($self->{cfplus_ext}) { 1325 if ($self->{cfplus_ext}) {
700 $self->send_ext_req (lookat => "$x $y", sub { 1326 $self->send_ext_req (lookat => $x, $y, sub {
701 my %res = split /\x00/, $_[0]; 1327 my (%msg) = @_;
702 1328
703 if (exists $res{npc_dialog}) { 1329 if (exists $msg{npc_dialog}) {
704 # start npc chat dialog 1330 # start npc chat dialog
705 $self->{npc_dialog} = new CFClient::NPCDialog:: 1331 $self->{npc_dialog} = new CFPlus::NPCDialog::
706 dx => $x, 1332 token => $msg{npc_dialog},
707 dy => $y,
708 title => "$res{npc_dialog} (NPC)", 1333 title => "$msg{npc_dialog}[0] (NPC)",
709 conn => $self, 1334 conn => $self,
710 ; 1335 ;
711 } 1336 }
712 }); 1337 });
713 } 1338 }
… …
716} 1341}
717 1342
718sub destroy { 1343sub destroy {
719 my ($self) = @_; 1344 my ($self) = @_;
720 1345
721 $self->{npc_dialog}->destroy 1346 (delete $self->{npc_dialog})->destroy
722 if $self->{npc_dialog}; 1347 if $self->{npc_dialog};
723 1348
724 $self->SUPER::destroy; 1349 $self->SUPER::destroy;
725}
726 1350
1351 %$self = ();
1352}
1353
727package CFClient::NPCDialog; 1354package CFPlus::NPCDialog;
728 1355
729our @ISA = 'CFClient::UI::FancyFrame'; 1356our @ISA = 'CFPlus::UI::Toplevel';
730 1357
731sub new { 1358sub new {
732 my $class = shift; 1359 my $class = shift;
733 1360
734 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
… …
737 name => "npc_dialog", 1364 name => "npc_dialog",
738 force_w => $::WIDTH * 0.7, 1365 force_w => $::WIDTH * 0.7,
739 force_h => $::HEIGHT * 0.7, 1366 force_h => $::HEIGHT * 0.7,
740 title => "NPC Dialog", 1367 title => "NPC Dialog",
741 kw => { hi => 0, yes => 0, no => 0 }, 1368 kw => { hi => 0, yes => 0, no => 0 },
1369 has_close_button => 1,
742 @_, 1370 @_,
743 ); 1371 );
744 1372
745 Scalar::Util::weaken (my $this = $self); 1373 CFPlus::weaken (my $this = $self);
1374
1375 $self->connect (delete => sub { $this->destroy; 1 });
746 1376
747 # better use a pane... 1377 # better use a pane...
748 $self->add (my $hbox = new CFClient::UI::HBox); 1378 $self->add (my $hbox = new CFPlus::UI::HBox);
749 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1379 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
750 1380
751 $hbox->add (my $vbox = new CFClient::UI::VBox); 1381 $hbox->add (my $vbox = new CFPlus::UI::VBox);
752 1382
753 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1383 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
754 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1384 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
755 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1385 tooltip => "#npc_message_entry",
756 . "Sometimes you have to tell an NPC something you cannot find out during "
757 . "a normal conversation (such as a password). In those cases you have to use "
758 . "this text entry. You can also enter responses manually instead of using the response "
759 . "buttons below.",
760 on_activate => sub { 1386 on_activate => sub {
761 my ($entry, $text) = @_; 1387 my ($entry, $text) = @_;
762 1388
763 return unless $text =~ /\S/; 1389 return unless $text =~ /\S/;
764 1390
765 $entry->set_text (""); 1391 $entry->set_text ("");
766 $this->send ($text); 1392 $this->send ($text);
1393
1394 0
767 }, 1395 },
768 ); 1396 );
769 1397
770 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1398 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
771 1399
772 $self->{close_button} = new CFClient::UI::Button 1400 $self->{bye_button} = new CFPlus::UI::Button
773 text => "Bye (close)", 1401 text => "Bye (close)",
774 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1402 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
775 on_activate => sub { $this->destroy }, 1403 on_activate => sub { $this->destroy; 1 },
776 ; 1404 ;
777 1405
778 $self->update_options; 1406 $self->update_options;
779 1407
780 $self->{token} = $self->{conn}->ext_token; 1408 $self->{id} = "npc-channel-" . $self->{conn}->token;
781 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1409 $self->{conn}->connect_ext ($self->{id} => sub {
782 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1410 $this->feed (@_) if $this;
1411 });
783 1412
1413 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1414
784 $self->{entry}->focus_in; 1415 $self->{entry}->grab_focus;
785 1416
786 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1417 $self->{textview}->add_paragraph ({
1418 fg => [1, 1, 0, 1],
1419 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1420 });
787 1421
788 $self->show; 1422 $self->show;
789 $self 1423 $self
790}; 1424};
791 1425
792sub update_options { 1426sub update_options {
793 my ($self) = @_; 1427 my ($self) = @_;
794 1428
795 Scalar::Util::weaken $self; 1429 CFPlus::weaken $self;
796 1430
797 $self->{options}->clear; 1431 $self->{options}->clear;
798 $self->{options}->add ($self->{close_button}); 1432 $self->{options}->add ($self->{bye_button});
799 1433
800 for my $kw (sort keys %{ $self->{kw} }) { 1434 for my $kw (sort keys %{ $self->{kw} }) {
801 $self->{options}->add (new CFClient::UI::Button 1435 $self->{options}->add (new CFPlus::UI::Button
802 text => $kw, 1436 text => $kw,
803 on_activate => sub { 1437 on_activate => sub {
804 $self->send ($kw); 1438 $self->send ($kw);
1439 0
805 }, 1440 },
806 ); 1441 );
807 } 1442 }
808} 1443}
809 1444
810sub feed { 1445sub feed {
811 my ($self, $data) = @_; 1446 my ($self, $type, @arg) = @_;
812 1447
813 my ($type, $msg) = split / /, $data, 2; 1448 CFPlus::weaken $self;
814 1449
815 if ($type eq "msg") { 1450 if ($type eq "update") {
816 my ($msg, @kw) = split /\x00/, $msg; 1451 my (%info) = @arg;
817 $self->{kw}{$_} = 1 for @kw;
818 1452
819 $msg = CFClient::UI::Label::escape $msg; 1453 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
820 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1454 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
821 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.
822 1455
823 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1456 if (exists $info{msg}) {
1457 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1458 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1459 my @link;
1460 $text =~ s{
1461 ($match)
1462 }{
1463 my $kw = $1;
1464
1465 push @link, new CFPlus::UI::Label
1466 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1467 can_hover => 1,
1468 can_events => 1,
1469 padding_x => 0,
1470 padding_y => 0,
1471 on_button_up => sub {
1472 $self->send ($kw);
1473 };
1474
1475 "\x{fffc}"
1476 }giex;
1477
1478 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1479 $self->{textview}->scroll_to_bottom;
1480 }
1481
824 $self->update_options; 1482 $self->update_options;
825 } else { 1483 } else {
826 $self->destroy; 1484 $self->destroy;
827 } 1485 }
828 1486
… …
830} 1488}
831 1489
832sub send { 1490sub send {
833 my ($self, $msg) = @_; 1491 my ($self, $msg) = @_;
834 1492
1493 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1494 $self->{textview}->scroll_to_bottom;
1495
835 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1496 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
836 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
837} 1497}
838 1498
839sub destroy { 1499sub destroy {
840 my ($self) = @_; 1500 my ($self) = @_;
841 1501
842 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 1502 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
843 1503
1504 if ($self->{conn}) {
1505 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
844 delete $self->{conn}{npc_dialog}; 1506 delete $self->{conn}{npc_dialog};
845 $self->{conn}->disconnect_ext ($self->{token}); 1507 $self->{conn}->disconnect_ext ($self->{id});
1508 }
846 1509
847 $self->SUPER::destroy; 1510 $self->SUPER::destroy;
848} 1511}
849 1512
8501; 15131
1514

Diff Legend

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