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

Diff Legend

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