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

Diff Legend

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