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.85 by root, Sun Oct 1 11:53:59 2006 UTC vs.
Revision 1.130 by root, Tue Jul 24 00:28:07 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my @cmd_help = map { 33 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 45 for @args;
34 46
35 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
37 @args 49 @args
38 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
40 52
53 $self->connect_ext (music => sub {
54 my (%ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_;
109
110 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($id) = @_;
133
134 $self->{widgetset}{$id} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($id) = @_;
142
143 my $ws = delete $self->{widgetset}{$id}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset create
151 $self->connect_ext (ws_c => sub {
152 my ($ws, $id, $class, $args) = @_;
153
154 for my $ev (grep /^on_/, keys %$args) {
155 $args->{$ev} = sub {
156 my $id = shift->{s_id};
157 $self->send_exti_msg (w_e => $id, $ev, \@_);
158
159 1
160 };
161 }
162
163 if (my $widget = eval {
164 local $SIG{__DIE__};
165 "CFPlus::UI::$class"->new (
166 %$args,
167 s_ws => $ws,
168 s_id => $id,
169 )
170 }
171 ) {
172 $self->{widget}{$id}
173 = $self->{widgetset}{$ws}{w}{$id}
174 = $widget;
175
176 $widget->connect (on_destroy => sub {
177 my ($widget) = @_;
178
179 delete $self->{widget}{$widget->{s_id}};
180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
181 });
182 } else {
183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
184 $self->send_exti_msg (w_e => $id, "destroy");
185 }
186 });
187
188 # widget call
189 $self->connect_ext (w_c => sub {
190 my ($id, $rid, $method, $args) = @_;
191
192 my $w = $self->{widget}{$id}
193 or return;
194
195 $args ||= [];
196
197 if ($rid) {
198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
199 } else {
200 $w->$method (@$args);
201 }
202 });
203
204 # widget set
205 $self->connect_ext (w_s => sub {
206 my ($id, $attr) = @_;
207
208 my $w = $self->{widget}{$id}
209 or return;
210
211 for (my $i = 0; $i < $#$attr; $i += 2) {
212 my ($member, $value) = @$attr[$i, $i+1];
213 if (defined $value) {
214 $w->{$member} = $value;
215 } else {
216 delete $w->{$member};
217 }
218 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 }
220 });
221
222 # widget get
223 $self->connect_ext (w_g => sub {
224 my ($id, $rid, $attr) = @_;
225
226 my $w = $self->{widget}{$id}
227 or return;
228
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
230 });
231
232 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy
236 for values %{delete $ws->{w} || {}};
237 }
238 });
239
41 $self->{map_widget}->add_command (@$_) 240 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 241 for @cmd_help;
43
44 $self->{noface} = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
46 242
47 { 243 {
48 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 244 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 245 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
50 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 246 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
51 } 247 }
52 248
249 {
250 $self->{noface} = my $tex = new_from_file CFPlus::Texture
251 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
252 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
253 }
254
53 $self->{open_container} = 0; 255 $self->{open_container} = 0;
54 256
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache"
57 or die "tilecache: unable to open database table";
58 $self->{facemap} = CFPlus::db_table "facemap"
59 or die "facemap: unable to open database table";
60
61 # per server 257 # per server
62 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 258 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
63 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
64 259
65 $self 260 $self
66} 261}
67 262
68sub logprint { 263sub logprint {
… …
225 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 420 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
226 $::GAUGES->{food} ->set_value ($fo, $fo_m); 421 $::GAUGES->{food} ->set_value ($fo, $fo_m);
227 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 422 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
228 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 423 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
229 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 424 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
230 my $rng = $stats->{+CS_STAT_RANGE}; 425 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
231 $rng =~ s/^Range: //; # thank you so much dear server
232 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
233 my $title = $stats->{+CS_STAT_TITLE}; 426 my $title = $stats->{+CS_STAT_TITLE};
234 $title =~ s/^Player: //; 427 $title =~ s/^Player: //;
235 $::STATWIDS->{title} ->set_text ("Title: " . $title); 428 $::STATWIDS->{title} ->set_text ("Title: " . $title);
236 429
237 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 430 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
257 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
258 451
259 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
260 $sktbl->clear; 453 $sktbl->clear;
261 454
455 my @add;
456
457 push @add,
262 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
264 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
265 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
266 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
267 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
268 465
269 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
270 467
271 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
272 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
286 if ($ev->{button} == 1) { 483 if ($ev->{button} == 1) {
287 $::CONN->user_send ("ready_skill $name"); 484 $::CONN->user_send ("ready_skill $name");
288 } elsif ($ev->{button} == 2) { 485 } elsif ($ev->{button} == 2) {
289 $::CONN->user_send ("use_skill $name"); 486 $::CONN->user_send ("use_skill $name");
290 } elsif ($ev->{button} == 3) { 487 } elsif ($ev->{button} == 3) {
488 my $shortname = CFPlus::shorten $name, 14;
291 (new CFPlus::UI::Menu 489 (new CFPlus::UI::Menu
292 items => [ 490 items => [
293 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 491 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
294 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 492 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
295 ], 493 ],
296 )->popup ($ev); 494 )->popup ($ev);
297 } else { 495 } else {
298 return 0; 496 return 0;
299 } 497 }
300 498
301 1 499 1
302 }; 500 };
303 501
502 push @add,
304 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 504 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
306 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 505 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
307 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 506 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
308 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 507 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
309 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
310 510
311 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
312 } 512 }
513
514 $sktbl->add_at (@add);
313 } 515 }
314 516
315 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
316 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
317 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
318 } 520 }
319} 521}
320 522
523sub macro_send {
524 my ($self, $macro) = @_;
525
526 for my $cmd (@{ $macro->{action} }) {
527 $self->send_command ($cmd);
528 }
529}
530
321sub user_send { 531sub user_send {
322 my ($self, $command) = @_; 532 my ($self, $command) = @_;
323 533
534 $self->{record}->($command)
324 if ($self->{record}) { 535 if $self->{record};
325 push @{$self->{record}}, $command;
326 }
327 536
328 $self->logprint ("send: ", $command); 537 $self->logprint ("send: ", $command);
329 $self->send_command ($command); 538 $self->send_command ($command);
330 ::status ($command); 539 ::status ($command);
331} 540}
332 541
333sub start_record { 542sub record {
334 my ($self) = @_; 543 my ($self, $cb) = @_;
335 544
336 $self->{record} = []; 545 $self->{record} = $cb;
337}
338
339sub stop_record {
340 my ($self) = @_;
341 return delete $self->{record};
342} 546}
343 547
344sub map_scroll { 548sub map_scroll {
345 my ($self, $dx, $dy) = @_; 549 my ($self, $dx, $dy) = @_;
346 550
… …
367 or return; 571 or return;
368 572
369 my ($hash, $x, $y, $w, $h) = @$map_info; 573 my ($hash, $x, $y, $w, $h) = @$map_info;
370 574
371 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 575 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
372 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 576 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
373 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 577 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
374} 578}
375 579
376sub map_clear { 580sub map_clear {
377 my ($self) = @_; 581 my ($self) = @_;
… …
381 585
382 $self->{map}->clear; 586 $self->{map}->clear;
383 delete $self->{map_widget}{magicmap}; 587 delete $self->{map_widget}{magicmap};
384} 588}
385 589
590sub bg_fetch {
591 my ($self) = @_;
592
593 my $id;
594
595 do {
596 $id = pop @{$self->{bg_fetch}}
597 or return;
598 } while $self->{texture}[$id];
599
600 CFPlus::DB::get tilecache => $id, sub {
601 my ($data) = @_;
602
603 return unless $self->{map}; # stop when destroyed
604
605 $self->set_texture ($id => $data)
606 if defined $data;
607
608 $self->bg_fetch;
609 };
610}
386 611
387sub load_map($$$) { 612sub load_map($$$) {
388 my ($self, $hash, $x, $y) = @_; 613 my ($self, $hash, $x, $y) = @_;
389 614
390 if (defined (my $data = $self->{mapcache}->get ($hash))) { 615 my $gen = $self->{map_change_gen};
616
617 CFPlus::DB::get $self->{mapcache} => $hash, sub {
618 return unless $gen == $self->{map_change_gen};
619
620 my ($data) = @_;
621
622 if (defined $data) {
391 $data = Compress::LZF::decompress $data; 623 $data = Compress::LZF::decompress $data;
392 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 624 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
393 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
394 my $data = $self->{tilecache}->get ($id)
395 or next;
396 625
397 $self->set_texture ($id => $data); 626 my $inprogress = @{ $self->{bg_fetch} || [] };
627 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
628 $self->bg_fetch unless $inprogress;
398 } 629 }
399 } 630 };
400} 631}
401 632
402# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 633# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
403# (server resource,s latency, bandwidth), so this hack is warranted. 634# (server resource,s latency, bandwidth), so this hack is warranted.
404# the right fix is to make real tiled maps with an overview file 635# the right fix is to make real tiled maps with an overview file
… …
468 699
469 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 700 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
470 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 701 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
471 702
472 } else { 703 } else {
704 my $gen = $self->{map_change_gen};
473 $self->send_mapinfo ("spatial $path$tile", sub { 705 $self->send_mapinfo ("spatial $path$tile", sub {
706 return unless $gen == $self->{map_change_gen};
707
474 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
475 709
476 return if $mode ne "spatial"; 710 return if $mode ne "spatial";
477 711
478 $x += $self->{map}->ox; 712 $x += $self->{map}->ox;
… …
492 726
493sub map_change { 727sub map_change {
494 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 728 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
495 729
496 $self->flush_map; 730 $self->flush_map;
731
732 ++$self->{map_change_gen};
497 733
498 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 734 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
499 735
500 my $mapmapw = $self->{mapmap}->{w}; 736 my $mapmapw = $self->{mapmap}->{w};
501 my $mapmaph = $self->{mapmap}->{h}; 737 my $mapmaph = $self->{mapmap}->{h};
… …
518 $self->load_map ($hash, $x, $y); 754 $self->load_map ($hash, $x, $y);
519 $self->flood_fill (0, 0, 0, "", $hash, $flags); 755 $self->flood_fill (0, 0, 0, "", $hash, $flags);
520} 756}
521 757
522sub face_find { 758sub face_find {
523 my ($self, $facenum, $face) = @_; 759 my ($self, $facenum, $face, $cb) = @_;
524 760
525 my $hash = "$face->{chksum},$face->{name}"; 761 my $hash = "$face->{chksum},$face->{name}";
526 762
527 my $id = $self->{facemap}->get ($hash); 763 my $id = CFPlus::DB::get_tile_id_sync $hash;
528 764
529 unless ($id) {
530 # create new id for face
531 # I love transactions
532 for (1..100) {
533 my $txn = $CFPlus::DB_ENV->txn_begin;
534 my $status = $self->{facemap}->db_get (id => $id);
535 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
536 $id = ($id || 64) + 1;
537 if ($self->{facemap}->put (id => $id) == 0
538 && $self->{facemap}->put ($hash => $id) == 0) {
539 $txn->txn_commit;
540
541 goto gotid;
542 }
543 }
544 $txn->txn_abort;
545 }
546
547 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
548 }
549
550gotid:
551 $face->{id} = $id; 765 $face->{id} = $id;
552 $self->{map}->set_face ($facenum => $id);
553 $self->{faceid}[$facenum] = $id;#d# 766 $self->{faceid}[$facenum] = $id;
554 767
555 my $face = $self->{tilecache}->get ($id); 768 $self->{map}->set_tileid ($facenum => $id);
556 769
557 if ($face) { 770 CFPlus::DB::get tilecache => $id, $cb;
558 #$self->face_prefetch;
559 $face
560 } else {
561 my $tex = $self->{noface};
562 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
563 undef
564 };
565} 771}
566 772
567sub face_update { 773sub face_update {
568 my ($self, $facenum, $face, $changed) = @_; 774 my ($self, $facenum, $face, $changed) = @_;
569 775
570 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
777 if $changed;
571 778
572 $self->set_texture ($face->{id} => delete $face->{image}); 779 $self->set_texture ($face->{id} => delete $face->{image});
780}
781
782sub smooth_update {
783 my ($self, $facenum, $face) = @_;
784
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
573} 786}
574 787
575sub set_texture { 788sub set_texture {
576 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
577 790
791 return unless $self->{map};
792
578 $self->{texture}[$id] ||= do { 793 $self->{texture}[$id] = my $tex =
579 my $tex =
580 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
581 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
582 796
583 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
584 $self->{map_widget}->update; 798 $self->{map_widget}->update;
585 799
586 $tex 800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
587 }; 812 }
588} 813}
589 814
590sub sound_play { 815sub sound_play {
591 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
592 817
… …
602 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
603 828
604 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
605} 830}
606 831
607sub drawinfo { 832sub sanitise_xml($) {
608 my ($self, $color, $text) = @_; 833 local $_ = shift;
609 834
610 my @color = ( 835 # we now weed out all tags we do not support
836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
837 # now all entities
838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
839
840 # handle some elements
841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
843
844 $_
845}
846
847our %NAME_TO_COLOR = (
848 black => 0,
849 white => 1,
850 darkblue => 2,
851 red => 3,
852 orange => 4,
853 lightblue => 5,
854 darkorange => 6,
855 green => 7,
856 darkgreen => 8,
857 grey => 9,
858 brown => 10,
859 yellow => 11,
860 tan => 12,
861);
862
863our @CF_COLOR = (
611 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 864 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
612 [1.00, 1.00, 1.00], 865 [1.00, 1.00, 1.00],
613 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 866 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
614 [1.00, 0.00, 0.00], 867 [1.00, 0.00, 0.00],
615 [1.00, 0.54, 0.00], 868 [1.00, 0.54, 0.00],
616 [0.11, 0.56, 1.00], 869 [0.11, 0.56, 1.00],
617 [0.93, 0.46, 0.00], 870 [0.93, 0.46, 0.00],
618 [0.18, 0.54, 0.34], 871 [0.18, 0.54, 0.34],
619 [0.56, 0.73, 0.56], 872 [0.56, 0.73, 0.56],
620 [0.80, 0.80, 0.80], 873 [0.80, 0.80, 0.80],
621 [0.75, 0.61, 0.20], 874 [0.75, 0.61, 0.20],
622 [0.99, 0.77, 0.26], 875 [0.99, 0.77, 0.26],
623 [0.74, 0.65, 0.41], 876 [0.74, 0.65, 0.41],
624 ); 877);
625 878
879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
881
882 $text = sanitise_xml $text;
883
884 if (my $cb = $self->{cb_msg}{$type}) {
885 $_->($self, $color, $type, $text, @extra) for values %$cb;
886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
887 $type =~ s/-/_/g;
888 $self->{$type} = $text;
889 } else {
626 $self->logprint ("info: ", $text); 890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
627 892
628 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 893 my $fg = $CF_COLOR[$color % @CF_COLOR];
629 894
630 # try to create single paragraphs of multiple lines sent by the server 895 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers
631 $text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
632 898
633 $text = CFPlus::asxml $text; 899 ::message ({ fg => $fg, markup => $_ })
634 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 900 for split /\n/, $text;
635 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
636 901
637 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
638 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
639 $self->{logview}->scroll_to_bottom;
640
641 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
642 group => $text, 903 group => $text,
643 fg => $color[$color], 904 fg => $fg,
644 timeout => $color >= 2 ? 180 : 10, 905 timeout => $color >= 2 ? 180 : 10,
645 tooltip_font => $::FONT_FIXED, 906 tooltip_font => $::FONT_FIXED,
646 ); 907 );
647} 908 }
648
649sub drawextinfo {
650 my ($self, $color, $type, $subtype, $message) = @_;
651
652 $self->drawinfo ($color, $message);
653} 909}
654 910
655sub spell_add { 911sub spell_add {
656 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
657 913
658 # try to create single paragraphs out of the multiple lines sent by the server 914 # try to create single paragraphs out of the multiple lines sent by the server
659 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 915 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
660 $spell->{message} =~ s/\n+$//; 916 $spell->{message} =~ s/\n+$//;
661 $spell->{message} ||= "Server did not provide a description for this spell."; 917 $spell->{message} ||= "Server did not provide a description for this spell.";
662 918
663 $::SPELL_PAGE->add_spell ($spell); 919 $::SPELL_LIST->add_spell ($spell);
664 920
665 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 921 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
666 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 922 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
667} 923}
668 924
669sub spell_delete { 925sub spell_delete {
670 my ($self, $spell) = @_; 926 my ($self, $spell) = @_;
671 927
672 $::SPELL_PAGE->remove_spell ($spell); 928 $::SPELL_LIST->remove_spell ($spell);
929}
930
931sub setup {
932 my ($self, $setup) = @_;
933
934 $self->{map_widget}->set_tilesize ($self->{tilesize});
935 $::MAP->resize ($self->{mapw}, $self->{maph});
673} 936}
674 937
675sub addme_success { 938sub addme_success {
676 my ($self) = @_; 939 my ($self) = @_;
677 940
… …
738 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
739 return unless $::CONN; 1002 return unless $::CONN;
740 1003
741 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
742 1005
1006 my @add;
1007
743 my $row; 1008 my $row;
744 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
745 if ($row < 6) { 1010 if ($row < 6) {
746 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
747 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
748 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
749 1014
1015 push @add,
750 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
751 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
752 1018
753 $row++; 1019 $row++;
754 } else { 1020 } else {
755 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
756 text => "More...", 1022 text => "More...",
757 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
758 ); 1024 ;
759 last; 1025 last;
760 } 1026 }
761 } 1027 }
762 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
763 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
764 text => "Close container", 1030 text => "Close container",
765 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
766 ); 1032 ;
767 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
768 }); 1036 });
769 1037
770 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
771} 1039}
772 1040
… …
883 $::SERVER_INFO->set_markup ( 1151 $::SERVER_INFO->set_markup (
884 "server <tt>$self->{host}:$self->{port}</tt>\n" 1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
885 . "protocol version <tt>$self->{version}</tt>\n" 1153 . "protocol version <tt>$self->{version}</tt>\n"
886 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
887 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1155 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1156 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
888 . "editor support $yesno[!!length $self->{cvs_root}]\n" 1157 . "editing support $yesno[!!$self->{editor_support}]\n"
889 . "test server " . (length $self->{test_server} ? $self->{test_server} : $yesno[0]) . "\n"
890 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
891 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
892 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
893 . "map size $self->{mapw}×$self->{maph}\n" 1162 . "map size $self->{mapw}×$self->{maph}\n"
894 ); 1163 );
1164
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
895} 1166}
896 1167
897sub logged_in { 1168sub logged_in {
898 my ($self) = @_; 1169 my ($self) = @_;
899 1170
900 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
901 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
902 $self->update_server_info; 1175 $self->update_server_info;
903 1176
904 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
905 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
906 $self->{cvs_root} = $_[0]{cvs_root}; 1179 $self->{editor_support} = { @_ };
907 $self->{upload} = $_[0]{upload};
908 $self->{test_server} = $_[0]{server};
909 $self->update_server_info; 1180 $self->update_server_info;
910 1181
911 0 1182 0
912 }); 1183 });
913 } 1184 }
… …
917 1188
918 $self->update_server_info; 1189 $self->update_server_info;
919 1190
920 $self->send_command ("output-sync $::CFG->{output_sync}"); 1191 $self->send_command ("output-sync $::CFG->{output_sync}");
921 $self->send_command ("output-count $::CFG->{output_count}"); 1192 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
922 $self->send_command ("pickup $::CFG->{pickup}"); 1194 $self->send_command ("pickup $::CFG->{pickup}");
1195}
1196
1197sub buildat {
1198 my ($self, $builditem, $x, $y) = @_;
1199
1200 if ($self->{cfplus_ext}) {
1201 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1202 }
923} 1203}
924 1204
925sub lookat { 1205sub lookat {
926 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
927 1207
928 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
929 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
930 my ($msg) = @_; 1210 my (%msg) = @_;
931 1211
932 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
933 # start npc chat dialog 1213 # start npc chat dialog
934 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
935 dx => $x, 1215 token => $msg{npc_dialog},
936 dy => $y,
937 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
938 conn => $self, 1217 conn => $self,
939 ; 1218 ;
940 } 1219 }
941 }); 1220 });
942 } 1221 }
… …
949 1228
950 (delete $self->{npc_dialog})->destroy 1229 (delete $self->{npc_dialog})->destroy
951 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
952 1231
953 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
954} 1235}
955 1236
956package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
957 1238
958our @ISA = 'CFPlus::UI::Toplevel'; 1239our @ISA = 'CFPlus::UI::Toplevel';
… …
970 kw => { hi => 0, yes => 0, no => 0 }, 1251 kw => { hi => 0, yes => 0, no => 0 },
971 has_close_button => 1, 1252 has_close_button => 1,
972 @_, 1253 @_,
973 ); 1254 );
974 1255
975 Scalar::Util::weaken (my $this = $self); 1256 CFPlus::weaken (my $this = $self);
976 1257
977 $self->connect (delete => sub { $this->destroy; 1 }); 1258 $self->connect (delete => sub { $this->destroy; 1 });
978 1259
979 # better use a pane... 1260 # better use a pane...
980 $self->add (my $hbox = new CFPlus::UI::HBox); 1261 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1005 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1006 ; 1287 ;
1007 1288
1008 $self->update_options; 1289 $self->update_options;
1009 1290
1010 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1011 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1012 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1013 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1014 1297
1015 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1016 1299
1017 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1018 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1024}; 1307};
1025 1308
1026sub update_options { 1309sub update_options {
1027 my ($self) = @_; 1310 my ($self) = @_;
1028 1311
1029 Scalar::Util::weaken $self; 1312 CFPlus::weaken $self;
1030 1313
1031 $self->{options}->clear; 1314 $self->{options}->clear;
1032 $self->{options}->add ($self->{bye_button}); 1315 $self->{options}->add ($self->{bye_button});
1033 1316
1034 for my $kw (sort keys %{ $self->{kw} }) { 1317 for my $kw (sort keys %{ $self->{kw} }) {
… …
1041 ); 1324 );
1042 } 1325 }
1043} 1326}
1044 1327
1045sub feed { 1328sub feed {
1046 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1047 1330
1048 Scalar::Util::weaken $self; 1331 CFPlus::weaken $self;
1049 1332
1050 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1051 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1052 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1053
1054 my $text = "\n" . CFPlus::asxml $msg->{msg};
1055 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1056 my @link;
1057 $text =~ s{
1058 ($match)
1059 }{
1060 my $kw = $1;
1061
1062 push @link, new CFPlus::UI::Label
1063 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1064 can_hover => 1,
1065 can_events => 1,
1066 padding_x => 0,
1067 padding_y => 0,
1068 on_button_up => sub {
1069 $self->send ($kw);
1070 };
1071
1072 "\x{fffc}"
1073 }giex;
1074 1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1075 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1076 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1077 $self->update_options; 1365 $self->update_options;
1078 } else { 1366 } else {
1079 $self->destroy; 1367 $self->destroy;
1080 } 1368 }
1081 1369
… …
1086 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1087 1375
1088 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1089 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1090 1378
1091 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1092} 1380}
1093 1381
1094sub destroy { 1382sub destroy {
1095 my ($self) = @_; 1383 my ($self) = @_;
1096 1384
1097 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1098 1386
1099 if ($self->{conn}) { 1387 if ($self->{conn}) {
1100 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1101 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1102 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1103 } 1391 }
1104 1392
1105 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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