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

Diff Legend

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