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.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.128 by root, Mon Jul 23 21:03:26 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 (@_); 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
50 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 51 CFPlus::Pod::find command => "*";
39 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 (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) {
219 $w->{$member} = $value;
220 } else {
221 delete $w->{$member};
222 }
223 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
224 }
225 });
226
227 # widget get
228 $self->connect_ext (w_g => sub {
229 my ($arg) = @_;
230
231 my $w = $self->{widget}{$arg->{id}}
232 or return;
233
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
235 });
236
237 # destroy widgets on logout
238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
239 for my $ws (values %{delete $self->{widgetset} || {}}) {
240 $_->destroy
241 for values %{delete $ws->{w} || {}};
242 }
243 });
244
40 $self->{map_widget}->add_command (@$_) 245 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 246 for @cmd_help;
42 247
248 {
249 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
250 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
251 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
252 }
253
254 {
43 $self->{noface} = new_from_file CFPlus::Texture 255 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 256 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
257 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
258 }
45 259
46 $self->{open_container} = 0; 260 $self->{open_container} = 0;
47 261
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 262 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 263 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 264
55 $self 265 $self
56} 266}
57 267
58sub logprint { 268sub logprint {
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 425 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 426 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 427 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 428 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 429 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 430 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
221 $rng =~ s/^Range: //; # thank you so much dear server
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE}; 431 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 432 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 433 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 434
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 435 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
247 my @skills = keys %{ $self->{skill_info} }; 455 my @skills = keys %{ $self->{skill_info} };
248 456
249 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
250 $sktbl->clear; 458 $sktbl->clear;
251 459
460 my @add;
461
462 push @add,
252 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
253 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
254 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
255 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
256 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
257 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ;
258 470
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 471 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 472
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 473 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 474 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 475
265 my ($x, $y) = (0, 1); 476 my ($x, $y) = (0, 1);
266 for ( 477 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 478 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 479 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 488 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 489 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 490 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 491 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 492 } elsif ($ev->{button} == 3) {
493 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 494 (new CFPlus::UI::Menu
283 items => [ 495 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 496 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 497 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 498 ],
287 )->popup ($ev); 499 )->popup ($ev);
288 } else { 500 } else {
289 return 0; 501 return 0;
290 } 502 }
291 503
292 1 504 1
293 }; 505 };
294 506
507 push @add,
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 508 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 509 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 510 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 511 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 512 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
513 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
514 ;
300 515
301 $x++ and ($x, $y) = (0, $y + 1); 516 $x++ and ($x, $y) = (0, $y + 1);
302 } 517 }
518
519 $sktbl->add_at (@add);
303 } 520 }
304 521
305 for (grep exists $stats->{$_}, @skills) { 522 for (grep exists $stats->{$_}, @skills) {
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 525 }
309} 526}
310 527
528sub macro_send {
529 my ($self, $macro) = @_;
530
531 for my $cmd (@{ $macro->{action} }) {
532 $self->send_command ($cmd);
533 }
534}
535
311sub user_send { 536sub user_send {
312 my ($self, $command) = @_; 537 my ($self, $command) = @_;
313 538
539 $self->{record}->($command)
314 if ($self->{record}) { 540 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 541
318 $self->logprint ("send: ", $command); 542 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 543 $self->send_command ($command);
320 ::status ($command); 544 ::status ($command);
321} 545}
322 546
323sub start_record { 547sub record {
324 my ($self) = @_; 548 my ($self, $cb) = @_;
325 549
326 $self->{record} = []; 550 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 551}
333 552
334sub map_scroll { 553sub map_scroll {
335 my ($self, $dx, $dy) = @_; 554 my ($self, $dx, $dy) = @_;
336 555
… …
338} 557}
339 558
340sub feed_map1a { 559sub feed_map1a {
341 my ($self, $data) = @_; 560 my ($self, $data) = @_;
342 561
343 $self->{map}->map1a_update ($data); 562 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 563 $self->{map_widget}->update;
345} 564}
346 565
347sub magicmap { 566sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 567 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 576 or return;
358 577
359 my ($hash, $x, $y, $w, $h) = @$map_info; 578 my ($hash, $x, $y, $w, $h) = @$map_info;
360 579
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 580 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 581 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 582 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 583}
365 584
366sub map_clear { 585sub map_clear {
367 my ($self) = @_; 586 my ($self) = @_;
… …
371 590
372 $self->{map}->clear; 591 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 592 delete $self->{map_widget}{magicmap};
374} 593}
375 594
595sub bg_fetch {
596 my ($self) = @_;
597
598 my $id;
599
600 do {
601 $id = pop @{$self->{bg_fetch}}
602 or return;
603 } while $self->{texture}[$id];
604
605 CFPlus::DB::get tilecache => $id, sub {
606 my ($data) = @_;
607
608 return unless $self->{map}; # stop when destroyed
609
610 $self->set_texture ($id => $data)
611 if defined $data;
612
613 $self->bg_fetch;
614 };
615}
376 616
377sub load_map($$$) { 617sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 618 my ($self, $hash, $x, $y) = @_;
379 619
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 620 my $gen = $self->{map_change_gen};
621
622 CFPlus::DB::get $self->{mapcache} => $hash, sub {
623 return unless $gen == $self->{map_change_gen};
624
625 my ($data) = @_;
626
627 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 628 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 629 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 630
387 $self->set_texture ($id => $data); 631 my $inprogress = @{ $self->{bg_fetch} || [] };
632 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
633 $self->bg_fetch unless $inprogress;
388 } 634 }
389 } 635 };
390} 636}
391 637
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 638# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 639# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 640# the right fix is to make real tiled maps with an overview file
… …
458 704
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 705 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 706 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 707
462 } else { 708 } else {
709 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 710 $self->send_mapinfo ("spatial $path$tile", sub {
711 return unless $gen == $self->{map_change_gen};
712
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 713 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 714
466 return if $mode ne "spatial"; 715 return if $mode ne "spatial";
467 716
468 $x += $self->{map}->ox; 717 $x += $self->{map}->ox;
… …
482 731
483sub map_change { 732sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 733 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 734
486 $self->flush_map; 735 $self->flush_map;
736
737 ++$self->{map_change_gen};
487 738
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 739 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 740
490 my $mapmapw = $self->{mapmap}->{w}; 741 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 742 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 759 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 760 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 761}
511 762
512sub face_find { 763sub face_find {
513 my ($self, $facenum, $face) = @_; 764 my ($self, $facenum, $face, $cb) = @_;
514 765
515 my $hash = "$face->{chksum},$face->{name}"; 766 my $hash = "$face->{chksum},$face->{name}";
516 767
517 my $id = $self->{facemap}->get ($hash); 768 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 769
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 770 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 771 $self->{faceid}[$facenum] = $id;
544 772
545 my $face = $self->{tilecache}->get ($id); 773 $self->{map}->set_tileid ($facenum => $id);
546 774
547 if ($face) { 775 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch;
549 $face
550 } else {
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 };
555} 776}
556 777
557sub face_update { 778sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 779 my ($self, $facenum, $face, $changed) = @_;
559 780
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 781 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
782 if $changed;
561 783
562 $self->set_texture ($face->{id} => delete $face->{image}); 784 $self->set_texture ($face->{id} => delete $face->{image});
785}
786
787sub smooth_update {
788 my ($self, $facenum, $face) = @_;
789
790 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
563} 791}
564 792
565sub set_texture { 793sub set_texture {
566 my ($self, $id, $data) = @_; 794 my ($self, $id, $data) = @_;
567 795
796 return unless $self->{map};
797
568 $self->{texture}[$id] ||= do { 798 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 799 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 800 $data, minify => 1, mipmap => 1;
572 801
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
574 $self->{map_widget}->update; 803 $self->{map_widget}->update;
575 804
576 $tex 805 $_->() for @{(delete $self->{face_cb}{$id}) || []};
806}
807
808sub connect_face_update {
809 my ($self, $id, $cb) = @_;
810
811 push @{$self->{face_cb}{$id}}, $cb;
812
813 CFPlus::guard {
814 @{$self->{face_cb}{$id}}
815 = grep $_ != $cb,
816 @{$self->{face_cb}{$id}};
577 }; 817 }
578} 818}
579 819
580sub sound_play { 820sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 821 my ($self, $x, $y, $soundnum, $type) = @_;
582 822
… …
592 $LAST_QUERY = $prompt; 832 $LAST_QUERY = $prompt;
593 833
594 $self->{query}-> ($self, $flags, $prompt); 834 $self->{query}-> ($self, $flags, $prompt);
595} 835}
596 836
597sub drawinfo { 837sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 838 local $_ = shift;
599 839
600 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 = (
601 [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],
602 [1.00, 1.00, 1.00], 870 [1.00, 1.00, 1.00],
603 [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]
604 [1.00, 0.00, 0.00], 872 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 873 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 874 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 875 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 876 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 877 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 878 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 879 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 880 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 881 [0.74, 0.65, 0.41],
614 ); 882);
615 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 {
616 $self->logprint ("info: ", $text); 895 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood
617 897
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 898 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 899
620 # 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
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 902 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 903
623 $text = CFPlus::asxml $text; 904 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 905 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 906
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 907 $self->{statusbox}->add ($text,
632 group => $text, 908 group => $text,
633 fg => $color[$color], 909 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 910 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 911 tooltip_font => $::FONT_FIXED,
636 ); 912 );
637} 913 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 914}
644 915
645sub spell_add { 916sub spell_add {
646 my ($self, $spell) = @_; 917 my ($self, $spell) = @_;
647 918
648 # 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
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 920 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 921 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 922 $spell->{message} ||= "Server did not provide a description for this spell.";
652 923
653 $::SPELL_PAGE->add_spell ($spell); 924 $::SPELL_LIST->add_spell ($spell);
654 925
655 $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});
656 $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});
657} 928}
658 929
659sub spell_delete { 930sub spell_delete {
660 my ($self, $spell) = @_; 931 my ($self, $spell) = @_;
661 932
662 $::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});
663} 941}
664 942
665sub addme_success { 943sub addme_success {
666 my ($self) = @_; 944 my ($self) = @_;
667 945
… …
728 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
729 return unless $::CONN; 1007 return unless $::CONN;
730 1008
731 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
732 1010
1011 my @add;
1012
733 my $row; 1013 my $row;
734 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} }) {
735 if ($row < 6) { 1015 if ($row < 6) {
736 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
737 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
738 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
739 1019
1020 push @add,
740 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
741 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
742 1023
743 $row++; 1024 $row++;
744 } else { 1025 } else {
745 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
746 text => "More...", 1027 text => "More...",
747 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
748 ); 1029 ;
749 last; 1030 last;
750 } 1031 }
751 } 1032 }
752 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
753 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
754 text => "Close container", 1035 text => "Close container",
755 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
756 ); 1037 ;
757 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
758 }); 1041 });
759 1042
760 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
761} 1044}
762 1045
… …
873 $::SERVER_INFO->set_markup ( 1156 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1157 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1158 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1159 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "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"
1163 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1164 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1167 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1168 );
1169
1170 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 1171}
883 1172
884sub logged_in { 1173sub logged_in {
885 my ($self) = @_; 1174 my ($self) = @_;
886 1175
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1176 $self->send_ext_req (cfplus_support => version => 2, sub {
1177 my (%msg) = @_;
1178
888 $self->{cfplus_ext} = $_[0]{version}; 1179 $self->{cfplus_ext} = $msg{version};
889 $self->update_server_info; 1180 $self->update_server_info;
1181
1182 if ($self->{cfplus_ext} >= 2) {
1183 $self->send_ext_req ("editor_support", sub {
1184 $self->{editor_support} = { @_ };
1185 $self->update_server_info;
1186
1187 0
1188 });
1189 }
890 1190
891 0 1191 0
892 }); 1192 });
893 1193
894 $self->update_server_info; 1194 $self->update_server_info;
895 1195
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1196 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1197 $self->send_command ("output-count $::CFG->{output_count}");
1198 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1199 $self->send_command ("pickup $::CFG->{pickup}");
1200}
1201
1202sub buildat {
1203 my ($self, $builditem, $x, $y) = @_;
1204
1205 if ($self->{cfplus_ext}) {
1206 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1207 }
899} 1208}
900 1209
901sub lookat { 1210sub lookat {
902 my ($self, $x, $y) = @_; 1211 my ($self, $x, $y) = @_;
903 1212
904 if ($self->{cfplus_ext}) { 1213 if ($self->{cfplus_ext}) {
905 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1214 $self->send_ext_req (lookat => $x, $y, sub {
906 my ($msg) = @_; 1215 my (%msg) = @_;
907 1216
908 if (exists $msg->{npc_dialog}) { 1217 if (exists $msg{npc_dialog}) {
909 # start npc chat dialog 1218 # start npc chat dialog
910 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1219 $self->{npc_dialog} = new CFPlus::NPCDialog::
911 dx => $x, 1220 token => $msg{npc_dialog},
912 dy => $y,
913 title => "$msg->{npc_dialog} (NPC)", 1221 title => "$msg{npc_dialog}[0] (NPC)",
914 conn => $self, 1222 conn => $self,
915 ; 1223 ;
916 } 1224 }
917 }); 1225 });
918 } 1226 }
… …
921} 1229}
922 1230
923sub destroy { 1231sub destroy {
924 my ($self) = @_; 1232 my ($self) = @_;
925 1233
926 $self->{npc_dialog}->destroy 1234 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1235 if $self->{npc_dialog};
928 1236
929 $self->SUPER::destroy; 1237 $self->SUPER::destroy;
1238
1239 %$self = ();
930} 1240}
931 1241
932package CFPlus::NPCDialog; 1242package CFPlus::NPCDialog;
933 1243
934our @ISA = 'CFPlus::UI::FancyFrame'; 1244our @ISA = 'CFPlus::UI::Toplevel';
935 1245
936sub new { 1246sub new {
937 my $class = shift; 1247 my $class = shift;
938 1248
939 my $self = $class->SUPER::new ( 1249 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1256 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1257 has_close_button => 1,
948 @_, 1258 @_,
949 ); 1259 );
950 1260
951 Scalar::Util::weaken (my $this = $self); 1261 CFPlus::weaken (my $this = $self);
952 1262
953 $self->connect (delete => sub { $this->destroy; 1 }); 1263 $self->connect (delete => sub { $this->destroy; 1 });
954 1264
955 # better use a pane... 1265 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1266 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
981 on_activate => sub { $this->destroy; 1 }, 1291 on_activate => sub { $this->destroy; 1 },
982 ; 1292 ;
983 1293
984 $self->update_options; 1294 $self->update_options;
985 1295
986 $self->{id} = $self->{conn}->send_ext_req ( 1296 $self->{id} = "npc-channel-" . $self->{conn}->token;
987 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1297 $self->{conn}->connect_ext ($self->{id} => sub {
988 sub { $this && $this->feed (@_) } 1298 $this->feed (@_) if $this;
989 ); 1299 });
1300
1301 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
990 1302
991 $self->{entry}->grab_focus; 1303 $self->{entry}->grab_focus;
992 1304
993 $self->{textview}->add_paragraph ({ 1305 $self->{textview}->add_paragraph ({
994 fg => [1, 1, 0, 1], 1306 fg => [1, 1, 0, 1],
… …
1000}; 1312};
1001 1313
1002sub update_options { 1314sub update_options {
1003 my ($self) = @_; 1315 my ($self) = @_;
1004 1316
1005 Scalar::Util::weaken $self; 1317 CFPlus::weaken $self;
1006 1318
1007 $self->{options}->clear; 1319 $self->{options}->clear;
1008 $self->{options}->add ($self->{bye_button}); 1320 $self->{options}->add ($self->{bye_button});
1009 1321
1010 for my $kw (sort keys %{ $self->{kw} }) { 1322 for my $kw (sort keys %{ $self->{kw} }) {
… …
1017 ); 1329 );
1018 } 1330 }
1019} 1331}
1020 1332
1021sub feed { 1333sub feed {
1022 my ($self, $msg) = @_; 1334 my ($self, $type, @arg) = @_;
1023 1335
1024 Scalar::Util::weaken $self; 1336 CFPlus::weaken $self;
1025 1337
1026 if ($msg->{msgtype} eq "reply") { 1338 if ($type eq "update") {
1339 my (%info) = @arg;
1340
1027 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1341 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1028 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1342 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1029
1030 my $text = "\n" . CFPlus::asxml $msg->{msg};
1031 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1032 my @link;
1033 $text =~ s{
1034 ($match)
1035 }{
1036 my $kw = $1;
1037
1038 push @link, new CFPlus::UI::Label
1039 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1040 can_hover => 1,
1041 can_events => 1,
1042 padding_x => 0,
1043 padding_y => 0,
1044 on_button_up => sub {
1045 $self->send ($kw);
1046 };
1047
1048 chr 0xfffc
1049 }giex;
1050 1343
1344 if (exists $info{msg}) {
1345 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1346 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1347 my @link;
1348 $text =~ s{
1349 ($match)
1350 }{
1351 my $kw = $1;
1352
1353 push @link, new CFPlus::UI::Label
1354 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1355 can_hover => 1,
1356 can_events => 1,
1357 padding_x => 0,
1358 padding_y => 0,
1359 on_button_up => sub {
1360 $self->send ($kw);
1361 };
1362
1363 "\x{fffc}"
1364 }giex;
1365
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1366 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1367 $self->{textview}->scroll_to_bottom;
1368 }
1369
1053 $self->update_options; 1370 $self->update_options;
1054 } else { 1371 } else {
1055 $self->destroy; 1372 $self->destroy;
1056 } 1373 }
1057 1374
… …
1062 my ($self, $msg) = @_; 1379 my ($self, $msg) = @_;
1063 1380
1064 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1381 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1065 $self->{textview}->scroll_to_bottom; 1382 $self->{textview}->scroll_to_bottom;
1066 1383
1067 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1384 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1068} 1385}
1069 1386
1070sub destroy { 1387sub destroy {
1071 my ($self) = @_; 1388 my ($self) = @_;
1072 1389
1073 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1390 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1074 1391
1075 if ($self->{conn}) { 1392 if ($self->{conn}) {
1076 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1393 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1077 delete $self->{conn}{npc_dialog}; 1394 delete $self->{conn}{npc_dialog};
1078 $self->{conn}->disconnect_ext ($self->{id}); 1395 $self->{conn}->disconnect_ext ($self->{id});
1079 } 1396 }
1080 1397
1081 $self->SUPER::destroy; 1398 $self->SUPER::destroy;
1082} 1399}
1083 1400
10841 14011
1402

Diff Legend

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