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

Diff Legend

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