ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.92 by root, Sat Dec 9 21:26:46 2006 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 CFClient::UI; 9use CFPlus::UI;
10use CFPlus::Pod;
11use CFPlus::Macro;
12use CFPlus::Item;
13
14use Crossfire::Protocol::Base 0.95;
10 15
11use base 'Crossfire::Protocol::Base'; 16use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
14 17
15sub new { 18sub new {
16 my $class = shift; 19 my $class = shift;
17 20
18 my $self = $class->SUPER::new (@_); 21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
19 22
20 $self->{map_widget}->clr_commands; 23 $self->{map_widget}->clr_commands;
21 24
22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 25 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 26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 27 or die "unparseable command help: $_->{kw}[0]";
30 28
31 my $cmd = $1; 29 my $cmd = $1;
32 my @args = split /\|/, $2; 30 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 31 @args = (".*") unless @args;
34 32
33 my (undef, @par) = CFPlus::Pod::section_of $_;
34 my $text = CFPlus::Pod::as_label @par;
35
35 $_ = $_ eq ".*" ? "" : " $_" 36 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 37 for @args;
37 38
38 my $text = CFClient::pod_to_pango $head2->content; 39 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 40 sort { (length $a) <=> (length $b) }
42 @args; 41 @args
43 } 42 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*";
44 44
45 \@cmd_help
46 };
47
48 $self->{map_widget}->add_command (@$_) 45 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 46 for @cmd_help;
50 47
51 $self->{noface} = new_from_file CFClient::Texture 48 $self->{noface} = new_from_file CFPlus::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50
51 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 }
53 56
54 $self->{open_container} = 0; 57 $self->{open_container} = 0;
55 58
56 # "global" 59 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache"; 60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
58 $self->{facemap} = CFClient::db_table "facemap"; 62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
59 64
60 # per server 65 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
62 68
63 $self 69 $self
64} 70}
65 71
66sub logprint { 72sub logprint {
67 my ($self, @a) = @_; 73 my ($self, @a) = @_;
74
75 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 76 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 77
70 my $fh = $open_logs{$filename}; 78 open my $fh, ">>:utf8", $path
71 unless ($fh) {
72 # FIXME: handle this more gracefully?
73 open $fh, ">>", $filename
74 or die "Couldn't open logfile: log.$self->{host}: $!"; 79 or die "Couldn't open logfile $path: $!";
75 80
76 $open_logs{$filename} = $fh; 81 $fh->autoflush (1);
82
83 $fh;
77 } 84 };
78 85
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 86 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 87
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 88 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 89 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 90
84 print $fh "$ts ", @a, "\n"; 91 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 92}
87 93
88sub _stat_numdiff { 94sub _stat_numdiff {
89 my ($self, $old, $new) = @_; 95 my ($self, $name, $old, $new) = @_;
90 96
91 my $diff = $new - $old; 97 my $diff = $new - $old;
92 $diff > 0 ? "+$diff" : $diff 98
99 $diff = 0.01 * int $diff * 100;
100
101 0.1 >= abs $diff ? ()
102 : $diff < 0 ? "$name$diff" : "$name+$diff"
93} 103}
94 104
95sub _stat_skillmaskdiff { 105sub _stat_skillmaskdiff {
96 my ($self, $old, $new) = @_; 106 my ($self, $name, $old, $new) = @_;
97 107
98 my $diff = $old ^ $new; 108 my $diff = $old ^ $new
109 or return;
99 110
100 my @diff = map 111 my @diff = map
101 { 112 {
102 $diff & $_ 113 $diff & $_
103 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 114 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
… …
150); 161);
151 162
152sub stats_update { 163sub stats_update {
153 my ($self, $stats) = @_; 164 my ($self, $stats) = @_;
154 165
155 if (my $prev = $self->{prev_stats}) { 166 my $prev = $self->{prev_stats} || { };
156 if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) { 167
168 if (my @diffs =
169 (
170 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
171 map {
172 $stats->{$_} && $prev->{$_}
173 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
174 } sort { $a <=> $b } keys %{$self->{skill_info}}
175 )
176 ) {
177 my $msg = join " ", @diffs;
157 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5); 178 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
179 }
180
181 if (
182 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
183 ) {
184 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
185 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
186 }
187
188 $self->update_stats_window ($stats, $prev);
189
190 $self->{prev_stats} = { %$stats };
191}
192
193my %RES_TBL = (
194 phys => CS_STAT_RES_PHYS,
195 magic => CS_STAT_RES_MAG,
196 fire => CS_STAT_RES_FIRE,
197 elec => CS_STAT_RES_ELEC,
198 cold => CS_STAT_RES_COLD,
199 conf => CS_STAT_RES_CONF,
200 acid => CS_STAT_RES_ACID,
201 drain => CS_STAT_RES_DRAIN,
202 ghit => CS_STAT_RES_GHOSTHIT,
203 pois => CS_STAT_RES_POISON,
204 slow => CS_STAT_RES_SLOW,
205 para => CS_STAT_RES_PARA,
206 tund => CS_STAT_TURN_UNDEAD,
207 fear => CS_STAT_RES_FEAR,
208 depl => CS_STAT_RES_DEPLETE,
209 deat => CS_STAT_RES_DEATH,
210 holyw => CS_STAT_RES_HOLYWORD,
211 blind => CS_STAT_RES_BLIND,
212);
213
214sub update_stats_window {
215 my ($self, $stats, $prev) = @_;
216
217 # I love text protocols...
218
219 my $hp = $stats->{+CS_STAT_HP} * 1;
220 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
221 my $sp = $stats->{+CS_STAT_SP} * 1;
222 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
223 my $fo = $stats->{+CS_STAT_FOOD} * 1;
224 my $fo_m = 999;
225 my $gr = $stats->{+CS_STAT_GRACE} * 1;
226 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
227
228 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE};
235 $rng =~ s/^Range: //; # thank you so much dear server
236 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
237 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
242 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
243 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
244 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
245 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
246 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
247 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
248 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
249 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
250 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
251 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
252 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
253 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
254
255 $self->update_weight;
256
257 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
258 for keys %RES_TBL;
259
260 my $sktbl = $::STATWIDS->{skill_tbl};
261 my @skills = keys %{ $self->{skill_info} };
262
263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264 $sktbl->clear;
265
266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
272
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
276 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
277
278 my ($x, $y) = (0, 1);
279 for (
280 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
281 map [$_, $self->{skill_info}{$_}],
282 grep exists $stats->{$_},
283 @skills
284 ) {
285 my ($idx, $name) = @$_;
286
287 my $spell_cb = sub {
288 my ($widget, $ev) = @_;
289
290 if ($ev->{button} == 1) {
291 $::CONN->user_send ("ready_skill $name");
292 } elsif ($ev->{button} == 2) {
293 $::CONN->user_send ("use_skill $name");
294 } elsif ($ev->{button} == 3) {
295 my $shortname = CFPlus::shorten $name, 14;
296 (new CFPlus::UI::Menu
297 items => [
298 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
299 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
300 ],
301 )->popup ($ev);
302 } else {
303 return 0;
304 }
305
306 1
307 };
308
309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
310 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
311 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
312 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
313 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
314 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
315
316 $x++ and ($x, $y) = (0, $y + 1);
158 } 317 }
159
160 if (
161 my @diffs = map {
162 $stats->{$_->[0]} != $prev->{$_->[0]}
163 ? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : ();
164 }
165 @statchange
166 ) {
167 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
168 $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
169 }
170 } 318 }
171 319
172 $self->{prev_stats} = { %$stats }; 320 for (grep exists $stats->{$_}, @skills) {
321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
323 }
324}
173 325
174 ::update_stats_window ($stats); 326sub macro_send {
327 my ($self, $macro) = @_;
328
329 for my $cmd (@{ $macro->{action} }) {
330 $self->send_command ($cmd);
331 }
175} 332}
176 333
177sub user_send { 334sub user_send {
178 my ($self, $command) = @_; 335 my ($self, $command) = @_;
179 336
337 $self->{record}->($command)
180 if ($self->{record}) { 338 if $self->{record};
181 push @{$self->{record}}, $command;
182 }
183 339
184 $self->logprint ("send: ", $command); 340 $self->logprint ("send: ", $command);
185 $self->send_command ($command); 341 $self->send_command ($command);
186 ::status ($command); 342 ::status ($command);
187} 343}
188 344
189sub start_record { 345sub record {
190 my ($self) = @_; 346 my ($self, $cb) = @_;
191 347
192 $self->{record} = []; 348 $self->{record} = $cb;
193}
194
195sub stop_record {
196 my ($self) = @_;
197 return delete $self->{record};
198} 349}
199 350
200sub map_scroll { 351sub map_scroll {
201 my ($self, $dx, $dy) = @_; 352 my ($self, $dx, $dy) = @_;
202 353
… …
204} 355}
205 356
206sub feed_map1a { 357sub feed_map1a {
207 my ($self, $data) = @_; 358 my ($self, $data) = @_;
208 359
209 $self->{map}->map1a_update ($data); 360 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
210 $self->{map_widget}->update; 361 $self->{map_widget}->update;
211} 362}
212 363
213sub magicmap { 364sub magicmap {
214 my ($self, $w, $h, $x, $y, $data) = @_; 365 my ($self, $w, $h, $x, $y, $data) = @_;
… …
384 535
385 unless ($id) { 536 unless ($id) {
386 # create new id for face 537 # create new id for face
387 # I love transactions 538 # I love transactions
388 for (1..100) { 539 for (1..100) {
389 my $txn = $CFClient::DB_ENV->txn_begin; 540 my $txn = $CFPlus::DB_ENV->txn_begin;
390 my $status = $self->{facemap}->db_get (id => $id); 541 my $status = $self->{facemap}->db_get (id => $id);
391 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
392 $id = ($id || 64) + 1; 543 $id = ($id || 64) + 1;
393 if ($self->{facemap}->put (id => $id) == 0 544 if ($self->{facemap}->put (id => $id) == 0
394 && $self->{facemap}->put ($hash => $id) == 0) { 545 && $self->{facemap}->put ($hash => $id) == 0) {
… …
398 } 549 }
399 } 550 }
400 $txn->txn_abort; 551 $txn->txn_abort;
401 } 552 }
402 553
403 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
404 } 555 }
405 556
406gotid: 557gotid:
407 $face->{id} = $id; 558 $face->{id} = $id;
408 $self->{map}->set_face ($facenum => $id); 559 $self->{map}->set_face ($facenum => $id);
… …
419 undef 570 undef
420 }; 571 };
421} 572}
422 573
423sub face_update { 574sub face_update {
424 my ($self, $facenum, $face) = @_; 575 my ($self, $facenum, $face, $changed) = @_;
425 576
426 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
427 578
428 $self->set_texture ($face->{id} => delete $face->{image}); 579 $self->set_texture ($face->{id} => delete $face->{image});
429} 580}
430 581
431sub set_texture { 582sub set_texture {
432 my ($self, $id, $data) = @_; 583 my ($self, $id, $data) = @_;
433 584
434 $self->{texture}[$id] ||= do { 585 $self->{texture}[$id] ||= do {
435 my $tex = 586 my $tex =
436 new_from_image CFClient::Texture 587 new_from_image CFPlus::Texture
437 $data, minify => 1, mipmap => 1; 588 $data, minify => 1, mipmap => 1;
438 589
439 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
440 $self->{map_widget}->update; 591 $self->{map_widget}->update;
441 592
… …
472 [0.11, 0.56, 1.00], 623 [0.11, 0.56, 1.00],
473 [0.93, 0.46, 0.00], 624 [0.93, 0.46, 0.00],
474 [0.18, 0.54, 0.34], 625 [0.18, 0.54, 0.34],
475 [0.56, 0.73, 0.56], 626 [0.56, 0.73, 0.56],
476 [0.80, 0.80, 0.80], 627 [0.80, 0.80, 0.80],
477 [0.55, 0.41, 0.13], 628 [0.75, 0.61, 0.20],
478 [0.99, 0.77, 0.26], 629 [0.99, 0.77, 0.26],
479 [0.74, 0.65, 0.41], 630 [0.74, 0.65, 0.41],
480 ); 631 );
481 632
482 $self->logprint ("info: ", $text); 633 $self->logprint ("info: ", $text);
483 634
484 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
485
486 # try to create single paragraphs of multiple lines sent by the server 635 # try to create single paragraphs of multiple lines sent by the server
487 $text =~ s/(?<=\S)\n(?=\w)/ /g; 636 $text =~ s/(?<=\S)\n(?=\w)/ /g;
488 637
489 $text = CFClient::UI::Label::escape $text; 638 $text = CFPlus::asxml $text;
490 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 639 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
491 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 640 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
492 641
493 $self->{logview}->add_paragraph ($color[$color], $_) 642 ::message ({ fg => $color[$color], markup => $_ })
494 for map "$time $_", split /\n/, $text; 643 for split /\n/, $text;
495 $self->{logview}->scroll_to_bottom;
496 644
497 $self->{statusbox}->add ($text, 645 $self->{statusbox}->add ($text,
498 group => $text, 646 group => $text,
499 fg => $color[$color], 647 fg => $color[$color],
500 timeout => $color >= 2 ? 60 : 10, 648 timeout => $color >= 2 ? 180 : 10,
501 tooltip_font => $::FONT_FIXED, 649 tooltip_font => $::FONT_FIXED,
502 ); 650 );
503} 651}
504 652
505sub drawextinfo { 653sub drawextinfo {
… …
509} 657}
510 658
511sub spell_add { 659sub spell_add {
512 my ($self, $spell) = @_; 660 my ($self, $spell) = @_;
513 661
514 # try to create single paragraphs of multiple lines sent by the server 662 # try to create single paragraphs out of the multiple lines sent by the server
515 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 663 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
516 $spell->{message} =~ s/\n+$//; 664 $spell->{message} =~ s/\n+$//;
517 $spell->{message} ||= "Server did not provide a description for this spell."; 665 $spell->{message} ||= "Server did not provide a description for this spell.";
518 666
519 $::SPELL_PAGE->add_spell ($spell); 667 $::SPELL_LIST->add_spell ($spell);
520 668
521 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 669 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
522 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 670 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
523} 671}
524 672
525sub spell_delete { 673sub spell_delete {
526 my ($self, $spell) = @_; 674 my ($self, $spell) = @_;
527 675
528 $::SPELL_PAGE->remove_spell ($spell); 676 $::SPELL_LIST->remove_spell ($spell);
677}
678
679sub setup {
680 my ($self, $setup) = @_;
681
682 $::MAP->resize ($self->{mapw}, $self->{maph});
529} 683}
530 684
531sub addme_success { 685sub addme_success {
532 my ($self) = @_; 686 my ($self) = @_;
533 687
534 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
535 my ($pom) = @_;
536
537 my %skill_help; 688 my %skill_help;
538 689
539 for my $head2 ($pom->head1->[3]->head2) { 690 for my $node (CFPlus::Pod::find skill_description => "*") {
540 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 691 my (undef, @par) = CFPlus::Pod::section_of $node;
541 } 692 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
542
543 \%skill_help
544 }; 693 };
545 694
546 for my $skill (values %{$self->{skill_info}}) { 695 for my $skill (values %{$self->{skill_info}}) {
547 $self->{map_widget}->add_command ("ready_skill $skill", 696 $self->{map_widget}->add_command ("ready_skill $skill",
548 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 697 (CFPlus::asxml "Ready the skill '$skill'\n\n")
549 . $skill_help->{$skill}); 698 . $skill_help{$skill});
550 $self->{map_widget}->add_command ("use_skill $skill", 699 $self->{map_widget}->add_command ("use_skill $skill",
551 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 700 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
552 . $skill_help->{$skill}); 701 . $skill_help{$skill});
553 } 702 }
554} 703}
555 704
556sub eof { 705sub eof {
557 my ($self) = @_; 706 my ($self) = @_;
… …
581 730
582 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 731 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
583 732
584 $self->send ("requestinfo image_sums $face $face"); 733 $self->send ("requestinfo image_sums $face $face");
585 734
586 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 735 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
587 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 736 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
588 } elsif (!exists $self->{num_faces}) { 737 } elsif (!exists $self->{num_faces}) {
589 $self->send ("requestinfo image_info"); 738 $self->send ("requestinfo image_info");
590 739
591 $self->{num_faces} = 0; 740 $self->{num_faces} = 0;
592 741
593 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 742 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
594 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 743 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
595 } 744 }
596} 745}
597 746
598sub update_floorbox { 747sub update_floorbox {
599 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 748 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
600 return unless $::CONN; 749 return unless $::CONN;
601 750
602 $::FLOORBOX->clear; 751 $::FLOORBOX->clear;
603 752
604 my $row; 753 my $row;
605 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 754 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
606 if ($row < 6) { 755 if ($row < 6) {
607 local $_->{face_widget}; # hack to force recreation of widget 756 local $_->{face_widget}; # hack to force recreation of widget
608 local $_->{desc_widget}; # hack to force recreation of widget 757 local $_->{desc_widget}; # hack to force recreation of widget
609 CFClient::Item::update_widgets $_; 758 CFPlus::Item::update_widgets $_;
610 759
611 $::FLOORBOX->add (0, $row, $_->{face_widget}); 760 $::FLOORBOX->add (0, $row, $_->{face_widget});
612 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 761 $::FLOORBOX->add (1, $row, $_->{desc_widget});
613 762
614 $row++; 763 $row++;
615 } else { 764 } else {
616 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 765 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
617 text => "More...", 766 text => "More...",
618 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 767 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
619 ); 768 );
620 last; 769 last;
621 } 770 }
622 } 771 }
772 if ($::CONN->{open_container}) {
773 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
774 text => "Close container",
775 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
776 );
777 }
623 }); 778 });
624 779
625 $::WANT_REFRESH++; 780 $::WANT_REFRESH++;
626} 781}
627 782
628sub set_opencont { 783sub set_opencont {
629 my ($conn, $tag, $name) = @_; 784 my ($conn, $tag, $name) = @_;
630 $conn->{open_container} = $tag; 785 $conn->{open_container} = $tag;
786 update_floorbox;
631 787
632 $::INV_RIGHT_HB->clear (); 788 $::INV_RIGHT_HB->clear ();
633 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 789 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
634 790
635 if ($tag != 0) { # Floor isn't closable, is it? 791 if ($tag != 0) { # Floor isn't closable, is it?
636 $::INV_RIGHT_HB->add (new CFClient::UI::Button 792 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
637 text => "Close container", 793 text => "Close container",
638 tooltip => "Close the currently open container (if one is open)", 794 tooltip => "Close the currently open container (if one is open)",
639 on_activate => sub { 795 on_activate => sub {
640 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 796 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
641 if $tag != 0; 797 if $tag != 0;
… …
649} 805}
650 806
651sub update_containers { 807sub update_containers {
652 my ($self) = @_; 808 my ($self) = @_;
653 809
654 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 810 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
655 for my $tag (keys %{ delete $self->{update_container} }) { 811 my $todo = delete $self->{update_container}
812 or return;
813
814 for my $tag (keys %$todo) {
815 update_floorbox if $tag == 0 or $tag == $self->{open_container};
656 if ($tag == 0) { 816 if ($tag == 0) {
657 update_floorbox;
658 $::INVR->set_items ($self->{container}{0}) 817 $::INVR->set_items ($self->{container}{0})
659 if $tag == $self->{open_container}; 818 if $tag == $self->{open_container};
660 } elsif ($tag == $self->{player}{tag}) { 819 } elsif ($tag == $self->{player}{tag}) {
661 $::INV->set_items ($self->{container}{$tag}) 820 $::INV->set_items ($self->{container}{$tag})
662 } else { 821 } else {
… …
693sub item_update { 852sub item_update {
694 my ($self, $item) = @_; 853 my ($self, $item) = @_;
695 854
696 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 855 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
697 856
698 CFClient::Item::update_widgets $item; 857 CFPlus::Item::update_widgets $item;
699 858
700 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 859 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
701 set_opencont ($::CONN, 0, "Floor"); 860 set_opencont ($::CONN, 0, "Floor");
702 861
703 } elsif ($item->{flags} & F_OPEN) { 862 } elsif ($item->{flags} & F_OPEN) {
704 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 863 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
705 864
706 } else { 865 } else {
707 $self->{update_container}{$item->{container}}++; 866 $self->{update_container}{$item->{container}}++;
708 $self->update_containers; 867 $self->update_containers;
709# if ($item->{container} == 0) {
710# update_floorbox;
711# update_container (0);
712# } elsif ($item->{container} == $self->{player}{tag}) {
713# $::INV->set_items ($self->{container}{$item->{container}})
714# }
715 } 868 }
716} 869}
717 870
718sub player_update { 871sub player_update {
719 my ($self, $player) = @_; 872 my ($self, $player) = @_;
873
874 $self->update_weight;
875}
876
877sub update_weight {
878 my ($self) = @_;
879
880 my $weight = .001 * $self->{player}{weight};
881 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
882
720 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 883 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
884 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
885 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
721} 886}
722 887
723sub update_server_info { 888sub update_server_info {
724 my ($self) = @_; 889 my ($self) = @_;
725 890
… …
728 $::SERVER_INFO->set_markup ( 893 $::SERVER_INFO->set_markup (
729 "server <tt>$self->{host}:$self->{port}</tt>\n" 894 "server <tt>$self->{host}:$self->{port}</tt>\n"
730 . "protocol version <tt>$self->{version}</tt>\n" 895 . "protocol version <tt>$self->{version}</tt>\n"
731 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 896 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
732 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 897 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
898 . "editing support $yesno[!!$self->{editor_support}]\n"
899 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
733 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 900 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
734 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 901 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
735 . "map size $self->{mapw}×$self->{maph}\n" 902 . "map size $self->{mapw}×$self->{maph}\n"
736 ); 903 );
904
905 ::setup_build_button ($self->{editor_support}->{builder_ui});
737} 906}
738 907
739sub logged_in { 908sub logged_in {
740 my ($self) = @_; 909 my ($self) = @_;
741 910
742 $self->send_ext_req (cfplus_support => "1", sub { 911 $self->send_ext_req (cfplus_support => version => 1, sub {
743 $self->{cfplus_ext} = $_[0]; 912 $self->{cfplus_ext} = $_[0]{version};
744 $self->update_server_info; 913 $self->update_server_info;
914
915 if ($self->{cfplus_ext} >= 2) {
916 $self->send_ext_req ("editor_support", sub {
917 $self->{editor_support} = $_[0];
918 $self->update_server_info;
919
920 0
921 });
922 }
923
924 0
745 }); 925 });
746 926
747 $self->update_server_info; 927 $self->update_server_info;
748 928
749 $self->send_command ("output-sync $::CFG->{output_sync}"); 929 $self->send_command ("output-sync $::CFG->{output_sync}");
750 $self->send_command ("output-count $::CFG->{output_count}"); 930 $self->send_command ("output-count $::CFG->{output_count}");
751 $self->send_command ("pickup $::CFG->{pickup}"); 931 $self->send_command ("pickup $::CFG->{pickup}");
752} 932}
753 933
934sub buildat {
935 my ($self, $builditem, $x, $y) = @_;
936
937 if ($self->{cfplus_ext}) {
938 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
939 }
940}
941
754sub lookat { 942sub lookat {
755 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
756 944
757 if ($self->{cfplus_ext}) { 945 if ($self->{cfplus_ext}) {
758 $self->send_ext_req (lookat => "$x $y", sub { 946 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
759 my %res = split /\x00/, $_[0]; 947 my ($msg) = @_;
760 948
761 if (exists $res{npc_dialog}) { 949 if (exists $msg->{npc_dialog}) {
762 # start npc chat dialog 950 # start npc chat dialog
763 $self->{npc_dialog} = new CFClient::NPCDialog:: 951 $self->{npc_dialog} = new CFPlus::NPCDialog::
764 dx => $x, 952 dx => $x,
765 dy => $y, 953 dy => $y,
766 title => "$res{npc_dialog} (NPC)", 954 title => "$msg->{npc_dialog} (NPC)",
767 conn => $self, 955 conn => $self,
768 ; 956 ;
769 } 957 }
770 }); 958 });
771 } 959 }
… …
774} 962}
775 963
776sub destroy { 964sub destroy {
777 my ($self) = @_; 965 my ($self) = @_;
778 966
779 $self->{npc_dialog}->destroy 967 (delete $self->{npc_dialog})->destroy
780 if $self->{npc_dialog}; 968 if $self->{npc_dialog};
781 969
782 $self->SUPER::destroy; 970 $self->SUPER::destroy;
783} 971}
784 972
785package CFClient::NPCDialog; 973package CFPlus::NPCDialog;
786 974
787our @ISA = 'CFClient::UI::FancyFrame'; 975our @ISA = 'CFPlus::UI::Toplevel';
788 976
789sub new { 977sub new {
790 my $class = shift; 978 my $class = shift;
791 979
792 my $self = $class->SUPER::new ( 980 my $self = $class->SUPER::new (
… …
795 name => "npc_dialog", 983 name => "npc_dialog",
796 force_w => $::WIDTH * 0.7, 984 force_w => $::WIDTH * 0.7,
797 force_h => $::HEIGHT * 0.7, 985 force_h => $::HEIGHT * 0.7,
798 title => "NPC Dialog", 986 title => "NPC Dialog",
799 kw => { hi => 0, yes => 0, no => 0 }, 987 kw => { hi => 0, yes => 0, no => 0 },
988 has_close_button => 1,
800 @_, 989 @_,
801 ); 990 );
802 991
803 Scalar::Util::weaken (my $this = $self); 992 CFPlus::weaken (my $this = $self);
993
994 $self->connect (delete => sub { $this->destroy; 1 });
804 995
805 # better use a pane... 996 # better use a pane...
806 $self->add (my $hbox = new CFClient::UI::HBox); 997 $self->add (my $hbox = new CFPlus::UI::HBox);
807 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 998 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
808 999
809 $hbox->add (my $vbox = new CFClient::UI::VBox); 1000 $hbox->add (my $vbox = new CFPlus::UI::VBox);
810 1001
811 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1002 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
812 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1003 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
813 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1004 tooltip => "#npc_message_entry",
814 . "Sometimes you have to tell an NPC something you cannot find out during "
815 . "a normal conversation (such as a password). In those cases you have to use "
816 . "this text entry. You can also enter responses manually instead of using the response "
817 . "buttons below.",
818 on_activate => sub { 1005 on_activate => sub {
819 my ($entry, $text) = @_; 1006 my ($entry, $text) = @_;
820 1007
821 return unless $text =~ /\S/; 1008 return unless $text =~ /\S/;
822 1009
… …
825 1012
826 0 1013 0
827 }, 1014 },
828 ); 1015 );
829 1016
830 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1017 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
831 1018
832 $self->{bye_button} = new CFClient::UI::Button 1019 $self->{bye_button} = new CFPlus::UI::Button
833 text => "Bye (close)", 1020 text => "Bye (close)",
834 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1021 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
835 on_activate => sub { $this->destroy; 0 }, 1022 on_activate => sub { $this->destroy; 1 },
836 ; 1023 ;
837 1024
838 $self->update_options; 1025 $self->update_options;
839 1026
840 $self->{token} = $self->{conn}->ext_token; 1027 $self->{id} = $self->{conn}->send_ext_req (
841 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1028 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
842 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1029 sub { $this && $this->feed (@_) }
1030 );
843 1031
844 $self->{entry}->grab_focus; 1032 $self->{entry}->grab_focus;
845 1033
846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1034 $self->{textview}->add_paragraph ({
1035 fg => [1, 1, 0, 1],
1036 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1037 });
847 1038
848 $self->show; 1039 $self->show;
849 $self 1040 $self
850}; 1041};
851 1042
852sub update_options { 1043sub update_options {
853 my ($self) = @_; 1044 my ($self) = @_;
854 1045
855 Scalar::Util::weaken $self; 1046 CFPlus::weaken $self;
856 1047
857 $self->{options}->clear; 1048 $self->{options}->clear;
858 $self->{options}->add ($self->{bye_button}); 1049 $self->{options}->add ($self->{bye_button});
859 1050
860 for my $kw (sort keys %{ $self->{kw} }) { 1051 for my $kw (sort keys %{ $self->{kw} }) {
861 $self->{options}->add (new CFClient::UI::Button 1052 $self->{options}->add (new CFPlus::UI::Button
862 text => $kw, 1053 text => $kw,
863 on_activate => sub { 1054 on_activate => sub {
864 $self->send ($kw); 1055 $self->send ($kw);
865 0 1056 0
866 }, 1057 },
867 ); 1058 );
868 } 1059 }
869} 1060}
870 1061
871sub feed { 1062sub feed {
872 my ($self, $data) = @_; 1063 my ($self, $msg) = @_;
873 1064
874 Scalar::Util::weaken $self; 1065 CFPlus::weaken $self;
875 1066
876 my ($type, $msg) = split / /, $data, 2; 1067 if ($msg->{msgtype} eq "reply") {
1068 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1069 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
877 1070
878 if ($type eq "msg") { 1071 my $text = "\n" . CFPlus::asxml $msg->{msg};
879 my ($msg, @kw) = split /\x00/, $msg;
880 $self->{kw}{$_} = 1 for @kw;
881
882 $msg = "\n" . CFClient::UI::Label::escape $msg;
883 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1072 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
884 my @link; 1073 my @link;
885 $msg =~ s{ 1074 $text =~ s{
886 ($match) 1075 ($match)
887 }{ 1076 }{
888 my $kw = $1; 1077 my $kw = $1;
889 1078
890 push @link, new CFClient::UI::Label 1079 push @link, new CFPlus::UI::Label
891 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1080 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
892 can_hover => 1, 1081 can_hover => 1,
893 can_events => 1, 1082 can_events => 1,
894 padding_x => 0, 1083 padding_x => 0,
895 padding_y => 0, 1084 padding_y => 0,
896 on_button_up => sub { 1085 on_button_up => sub {
897 $self->send ($kw); 1086 $self->send ($kw);
898 }; 1087 };
899 1088
900 chr 0xfffc 1089 "\x{fffc}"
901 }giex; 1090 }giex;
902 1091
903 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1092 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
904 $self->{textview}->scroll_to_bottom; 1093 $self->{textview}->scroll_to_bottom;
905 $self->update_options; 1094 $self->update_options;
906 } else { 1095 } else {
907 $self->destroy; 1096 $self->destroy;
908 } 1097 }
… …
911} 1100}
912 1101
913sub send { 1102sub send {
914 my ($self, $msg) = @_; 1103 my ($self, $msg) = @_;
915 1104
916 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1105 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
917 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
918 $self->{textview}->scroll_to_bottom; 1106 $self->{textview}->scroll_to_bottom;
1107
1108 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
919} 1109}
920 1110
921sub destroy { 1111sub destroy {
922 my ($self) = @_; 1112 my ($self) = @_;
923 1113
924 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1114 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
925 1115
1116 if ($self->{conn}) {
1117 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
926 delete $self->{conn}{npc_dialog}; 1118 delete $self->{conn}{npc_dialog};
927 $self->{conn}->disconnect_ext ($self->{token}); 1119 $self->{conn}->disconnect_ext ($self->{id});
1120 }
928 1121
929 $self->SUPER::destroy; 1122 $self->SUPER::destroy;
930} 1123}
931 1124
9321; 11251
1126

Diff Legend

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