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.63 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.102 by root, Wed Apr 18 18:16:16 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
10 16
11use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
12 18
13sub new { 19sub new {
14 my $class = shift; 20 my ($class, %arg) = @_;
15 21
16 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 %{$arg{setup_req} || {}},
26 },
27 );
17 28
18 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
19 30
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 31 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 33 or die "unparseable command help: $_->{kw}[0]";
28 34
29 my $cmd = $1; 35 my $cmd = $1;
30 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 37 @args = (".*") unless @args;
32 38
39 my (undef, @par) = CFPlus::Pod::section_of $_;
40 my $text = CFPlus::Pod::as_label @par;
41
33 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 43 for @args;
35 44
36 my $text = CFClient::pod_to_pango $head2->content; 45 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
40 @args; 47 @args
48 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*";
50
51 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_;
53
54 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 }
41 } 65 }
42
43 \@cmd_help
44 }; 66 });
45 67
46 $self->{map_widget}->add_command (@$_) 68 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 69 for @cmd_help;
48 70
71 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
73 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
74 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
75 }
76
77 {
49 $self->{noface} = new_from_file CFClient::Texture 78 $self->{noface} = my $tex = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 79 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
81 }
51 82
52 $self->{open_container} = 0; 83 $self->{open_container} = 0;
53 84
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server 85 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
60 87
61 $self 88 $self
62} 89}
63 90
64sub logprint { 91sub logprint {
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 269 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 270 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 271 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 272 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 273
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 274 $self->update_weight;
248 275
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 276 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 277 for keys %RES_TBL;
251 278
252 my $sktbl = $::STATWIDS->{skill_tbl}; 279 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 280 my @skills = keys %{ $self->{skill_info} };
254 281
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 283 $sktbl->clear;
257 284
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
264 291
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
296
265 my ($x, $y) = (1, 0); 297 my ($x, $y) = (0, 1);
266 for ( 298 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 299 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 300 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 301 grep exists $stats->{$_},
270 @skills 302 @skills
271 ) { 303 ) {
272 my ($idx, $name) = @$_; 304 my ($idx, $name) = @$_;
273 305
306 my $spell_cb = sub {
307 my ($widget, $ev) = @_;
308
309 if ($ev->{button} == 1) {
310 $::CONN->user_send ("ready_skill $name");
311 } elsif ($ev->{button} == 2) {
312 $::CONN->user_send ("use_skill $name");
313 } elsif ($ev->{button} == 3) {
314 my $shortname = CFPlus::shorten $name, 14;
315 (new CFPlus::UI::Menu
316 items => [
317 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
318 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
319 ],
320 )->popup ($ev);
321 } else {
322 return 0;
323 }
324
325 1
326 };
327
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
279 334
280 $x++ and ($x, $y) = (0, $y + 1); 335 $x++ and ($x, $y) = (0, $y + 1);
281 } 336 }
282 } 337 }
283 338
… …
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
287 } 342 }
288} 343}
289 344
345sub macro_send {
346 my ($self, $macro) = @_;
347
348 for my $cmd (@{ $macro->{action} }) {
349 $self->send_command ($cmd);
350 }
351}
352
290sub user_send { 353sub user_send {
291 my ($self, $command) = @_; 354 my ($self, $command) = @_;
292 355
356 $self->{record}->($command)
293 if ($self->{record}) { 357 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 358
297 $self->logprint ("send: ", $command); 359 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 360 $self->send_command ($command);
299 ::status ($command); 361 ::status ($command);
300} 362}
301 363
302sub start_record { 364sub record {
303 my ($self) = @_; 365 my ($self, $cb) = @_;
304 366
305 $self->{record} = []; 367 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 368}
312 369
313sub map_scroll { 370sub map_scroll {
314 my ($self, $dx, $dy) = @_; 371 my ($self, $dx, $dy) = @_;
315 372
… …
317} 374}
318 375
319sub feed_map1a { 376sub feed_map1a {
320 my ($self, $data) = @_; 377 my ($self, $data) = @_;
321 378
322 $self->{map}->map1a_update ($data); 379 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
323 $self->{map_widget}->update; 380 $self->{map_widget}->update;
324} 381}
325 382
326sub magicmap { 383sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 384 my ($self, $w, $h, $x, $y, $data) = @_;
… …
336 or return; 393 or return;
337 394
338 my ($hash, $x, $y, $w, $h) = @$map_info; 395 my ($hash, $x, $y, $w, $h) = @$map_info;
339 396
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 397 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
343} 400}
344 401
345sub map_clear { 402sub map_clear {
346 my ($self) = @_; 403 my ($self) = @_;
… …
350 407
351 $self->{map}->clear; 408 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 409 delete $self->{map_widget}{magicmap};
353} 410}
354 411
412sub bg_fetch {
413 my ($self) = @_;
414
415 my $id;
416
417 do {
418 $id = pop @{$self->{bg_fetch}}
419 or return;
420 } while $self->{texture}[$id];
421
422 CFPlus::DB::get tilecache => $id, sub {
423 my ($data) = @_;
424
425 return unless $self->{map}; # stop when destroyed
426
427 $self->set_texture ($id => $data)
428 if defined $data;
429
430 $self->bg_fetch;
431 };
432}
355 433
356sub load_map($$$) { 434sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 435 my ($self, $hash, $x, $y) = @_;
358 436
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 437 my $gen = $self->{map_change_gen};
438
439 CFPlus::DB::get $self->{mapcache} => $hash, sub {
440 return unless $gen == $self->{map_change_gen};
441
442 my ($data) = @_;
443
444 if (defined $data) {
360 $data = Compress::LZF::decompress $data; 445 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 446 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 447
366 $self->set_texture ($id => $data); 448 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress;
367 } 451 }
368 } 452 };
369} 453}
370 454
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 455# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 456# (server resource,s latency, bandwidth), so this hack is warranted.
373# the right fix is to make real tiled maps with an overview file 457# the right fix is to make real tiled maps with an overview file
… …
437 521
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 522 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 523 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 524
441 } else { 525 } else {
526 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 527 $self->send_mapinfo ("spatial $path$tile", sub {
528 return unless $gen == $self->{map_change_gen};
529
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 530 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 531
445 return if $mode ne "spatial"; 532 return if $mode ne "spatial";
446 533
447 $x += $self->{map}->ox; 534 $x += $self->{map}->ox;
… …
461 548
462sub map_change { 549sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 551
465 $self->flush_map; 552 $self->flush_map;
553
554 ++$self->{map_change_gen};
466 555
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 557
469 my $mapmapw = $self->{mapmap}->{w}; 558 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 559 my $mapmaph = $self->{mapmap}->{h};
… …
487 $self->load_map ($hash, $x, $y); 576 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 577 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 578}
490 579
491sub face_find { 580sub face_find {
492 my ($self, $facenum, $face) = @_; 581 my ($self, $facenum, $face, $cb) = @_;
493 582
494 my $hash = "$face->{chksum},$face->{name}"; 583 my $hash = "$face->{chksum},$face->{name}";
495 584
496 my $id = $self->{facemap}->get ($hash); 585 my $id = CFPlus::DB::get_tile_id_sync $hash;
497 586
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 587 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d# 588 $self->{faceid}[$facenum] = $id;
523 589
524 my $face = $self->{tilecache}->get ($id); 590 $self->{map}->set_tileid ($facenum => $id);
525 591
526 if ($face) { 592 CFPlus::DB::get tilecache => $id, $cb;
527 #$self->face_prefetch;
528 $face
529 } else {
530 my $tex = $self->{noface};
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 };
534} 593}
535 594
536sub face_update { 595sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 596 my ($self, $facenum, $face, $changed) = @_;
538 597
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
599 if $changed;
540 600
541 $self->set_texture ($face->{id} => delete $face->{image}); 601 $self->set_texture ($face->{id} => delete $face->{image});
602}
603
604sub smooth_update {
605 my ($self, $facenum, $face) = @_;
606
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
542} 608}
543 609
544sub set_texture { 610sub set_texture {
545 my ($self, $id, $data) = @_; 611 my ($self, $id, $data) = @_;
546 612
547 $self->{texture}[$id] ||= do { 613 $self->{texture}[$id] = my $tex =
548 my $tex =
549 new_from_image CFClient::Texture 614 new_from_image CFPlus::Texture
550 $data, minify => 1, mipmap => 1; 615 $data, minify => 1, mipmap => 1;
551 616
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 $self->{map_widget}->update; 618 $self->{map_widget}->update;
554
555 $tex
556 };
557} 619}
558 620
559sub sound_play { 621sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 622 my ($self, $x, $y, $soundnum, $type) = @_;
561 623
… …
590 [0.75, 0.61, 0.20], 652 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 653 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 654 [0.74, 0.65, 0.41],
593 ); 655 );
594 656
657 my $fg = $color[$color % @color];
658
595 $self->logprint ("info: ", $text); 659 $self->logprint ("info: ", $text);
596 660
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
598
599 # try to create single paragraphs of multiple lines sent by the server 661 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 663 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
601 664
602 $text = CFClient::UI::Label::escape $text; 665 $text = CFPlus::asxml $text;
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 668
606 $self->{logview}->add_paragraph ($color[$color], $_) 669 ::message ({ fg => $fg, markup => $_ })
607 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 670 for split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609 671
610 $self->{statusbox}->add ($text, 672 $self->{statusbox}->add ($text,
611 group => $text, 673 group => $text,
612 fg => $color[$color], 674 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 675 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 676 tooltip_font => $::FONT_FIXED,
615 ); 677 );
616} 678}
617 679
618sub drawextinfo { 680sub drawextinfo {
… …
622} 684}
623 685
624sub spell_add { 686sub spell_add {
625 my ($self, $spell) = @_; 687 my ($self, $spell) = @_;
626 688
627 # try to create single paragraphs of multiple lines sent by the server 689 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 690 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 691 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 692 $spell->{message} ||= "Server did not provide a description for this spell.";
631 693
632 $::SPELL_PAGE->add_spell ($spell); 694 $::SPELL_LIST->add_spell ($spell);
633 695
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 696 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 697 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 698}
637 699
638sub spell_delete { 700sub spell_delete {
639 my ($self, $spell) = @_; 701 my ($self, $spell) = @_;
640 702
641 $::SPELL_PAGE->remove_spell ($spell); 703 $::SPELL_LIST->remove_spell ($spell);
704}
705
706sub setup {
707 my ($self, $setup) = @_;
708
709 $self->{map_widget}->set_tilesize ($self->{tilesize});
710 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 711}
643 712
644sub addme_success { 713sub addme_success {
645 my ($self) = @_; 714 my ($self) = @_;
646 715
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 716 my %skill_help;
651 717
652 for my $head2 ($pom->head1->[3]->head2) { 718 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 719 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 720 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 721 };
658 722
659 for my $skill (values %{$self->{skill_info}}) { 723 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 724 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 725 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 726 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 727 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 728 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 729 . $skill_help{$skill});
666 } 730 }
667} 731}
668 732
669sub eof { 733sub eof {
670 my ($self) = @_; 734 my ($self) = @_;
… …
694 758
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 759 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696 760
697 $self->send ("requestinfo image_sums $face $face"); 761 $self->send ("requestinfo image_sums $face $face");
698 762
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 763 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 764 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) { 765 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info"); 766 $self->send ("requestinfo image_info");
703 767
704 $self->{num_faces} = 0; 768 $self->{num_faces} = 0;
705 769
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 770 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 771 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 } 772 }
709} 773}
710 774
711sub update_floorbox { 775sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 776 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 777 return unless $::CONN;
714 778
715 $::FLOORBOX->clear; 779 $::FLOORBOX->clear;
716 780
717 my $row; 781 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 782 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 783 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 784 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 785 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 786 CFPlus::Item::update_widgets $_;
723 787
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 788 $::FLOORBOX->add (0, $row, $_->{face_widget});
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 789 $::FLOORBOX->add (1, $row, $_->{desc_widget});
726 790
727 $row++; 791 $row++;
728 } else { 792 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 793 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
730 text => "More...", 794 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 795 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 796 );
733 last; 797 last;
734 } 798 }
735 } 799 }
736 if ($::CONN->{open_container}) { 800 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 801 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
738 text => "Close container", 802 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 803 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 804 );
741 } 805 }
742 }); 806 });
… …
748 my ($conn, $tag, $name) = @_; 812 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 813 $conn->{open_container} = $tag;
750 update_floorbox; 814 update_floorbox;
751 815
752 $::INV_RIGHT_HB->clear (); 816 $::INV_RIGHT_HB->clear ();
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 817 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
754 818
755 if ($tag != 0) { # Floor isn't closable, is it? 819 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 820 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
757 text => "Close container", 821 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 822 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 823 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 824 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 825 if $tag != 0;
… …
769} 833}
770 834
771sub update_containers { 835sub update_containers {
772 my ($self) = @_; 836 my ($self) = @_;
773 837
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 838 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 839 my $todo = delete $self->{update_container}
776 or return; 840 or return;
777 841
778 for my $tag (keys %$todo) { 842 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 843 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
816sub item_update { 880sub item_update {
817 my ($self, $item) = @_; 881 my ($self, $item) = @_;
818 882
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 883 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
820 884
821 CFClient::Item::update_widgets $item; 885 CFPlus::Item::update_widgets $item;
822 886
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 887 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 888 set_opencont ($::CONN, 0, "Floor");
825 889
826 } elsif ($item->{flags} & F_OPEN) { 890 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 891 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
828 892
829 } else { 893 } else {
830 $self->{update_container}{$item->{container}}++; 894 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 895 $self->update_containers;
832 } 896 }
833} 897}
834 898
835sub player_update { 899sub player_update {
836 my ($self, $player) = @_; 900 my ($self, $player) = @_;
901
902 $self->update_weight;
903}
904
905sub update_weight {
906 my ($self) = @_;
907
908 my $weight = .001 * $self->{player}{weight};
909 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
910
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 911 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
912 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
913 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 914}
839 915
840sub update_server_info { 916sub update_server_info {
841 my ($self) = @_; 917 my ($self) = @_;
842 918
… …
845 $::SERVER_INFO->set_markup ( 921 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 922 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 923 . "protocol version <tt>$self->{version}</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
849 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 930 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 931 );
932
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
854} 934}
855 935
856sub logged_in { 936sub logged_in {
857 my ($self) = @_; 937 my ($self) = @_;
858 938
859 $self->send_ext_req (cfplus_support => "1", sub { 939 $self->send_ext_req (cfplus_support => version => 1, sub {
860 $self->{cfplus_ext} = $_[0]; 940 $self->{cfplus_ext} = $_[0]{version};
861 $self->update_server_info; 941 $self->update_server_info;
942
943 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0];
946 $self->update_server_info;
947
948 0
949 });
950 }
951
952 0
862 }); 953 });
863 954
864 $self->update_server_info; 955 $self->update_server_info;
865 956
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 957 $self->send_command ("output-sync $::CFG->{output_sync}");
867 $self->send_command ("output-count $::CFG->{output_count}"); 958 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
868 $self->send_command ("pickup $::CFG->{pickup}"); 960 $self->send_command ("pickup $::CFG->{pickup}");
961}
962
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
869} 969}
870 970
871sub lookat { 971sub lookat {
872 my ($self, $x, $y) = @_; 972 my ($self, $x, $y) = @_;
873 973
874 if ($self->{cfplus_ext}) { 974 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 975 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
876 my %res = split /\x00/, $_[0]; 976 my ($msg) = @_;
877 977
878 if (exists $res{npc_dialog}) { 978 if (exists $msg->{npc_dialog}) {
879 # start npc chat dialog 979 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 980 $self->{npc_dialog} = new CFPlus::NPCDialog::
881 dx => $x, 981 dx => $x,
882 dy => $y, 982 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 983 title => "$msg->{npc_dialog} (NPC)",
884 conn => $self, 984 conn => $self,
885 ; 985 ;
886 } 986 }
887 }); 987 });
888 } 988 }
… …
891} 991}
892 992
893sub destroy { 993sub destroy {
894 my ($self) = @_; 994 my ($self) = @_;
895 995
896 $self->{npc_dialog}->destroy 996 (delete $self->{npc_dialog})->destroy
897 if $self->{npc_dialog}; 997 if $self->{npc_dialog};
898 998
899 $self->SUPER::destroy; 999 $self->SUPER::destroy;
900} 1000}
901 1001
902package CFClient::NPCDialog; 1002package CFPlus::NPCDialog;
903 1003
904our @ISA = 'CFClient::UI::FancyFrame'; 1004our @ISA = 'CFPlus::UI::Toplevel';
905 1005
906sub new { 1006sub new {
907 my $class = shift; 1007 my $class = shift;
908 1008
909 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
… …
912 name => "npc_dialog", 1012 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 1013 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 1014 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 1015 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 1016 kw => { hi => 0, yes => 0, no => 0 },
1017 has_close_button => 1,
917 @_, 1018 @_,
918 ); 1019 );
919 1020
920 Scalar::Util::weaken (my $this = $self); 1021 CFPlus::weaken (my $this = $self);
1022
1023 $self->connect (delete => sub { $this->destroy; 1 });
921 1024
922 # better use a pane... 1025 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 1026 $self->add (my $hbox = new CFPlus::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1027 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
925 1028
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 1029 $hbox->add (my $vbox = new CFPlus::UI::VBox);
927 1030
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1031 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1032 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
930 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1033 tooltip => "#npc_message_entry",
931 . "Sometimes you have to tell an NPC something you cannot find out during "
932 . "a normal conversation (such as a password). In those cases you have to use "
933 . "this text entry. You can also enter responses manually instead of using the response "
934 . "buttons below.",
935 on_activate => sub { 1034 on_activate => sub {
936 my ($entry, $text) = @_; 1035 my ($entry, $text) = @_;
937 1036
938 return unless $text =~ /\S/; 1037 return unless $text =~ /\S/;
939 1038
… …
942 1041
943 0 1042 0
944 }, 1043 },
945 ); 1044 );
946 1045
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1046 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
948 1047
949 $self->{bye_button} = new CFClient::UI::Button 1048 $self->{bye_button} = new CFPlus::UI::Button
950 text => "Bye (close)", 1049 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1050 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 1051 on_activate => sub { $this->destroy; 1 },
953 ; 1052 ;
954 1053
955 $self->update_options; 1054 $self->update_options;
956 1055
957 $self->{token} = $self->{conn}->ext_token; 1056 $self->{id} = $self->{conn}->send_ext_req (
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1057 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1058 sub { $this && $this->feed (@_) }
1059 );
960 1060
961 $self->{entry}->grab_focus; 1061 $self->{entry}->grab_focus;
962 1062
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1063 $self->{textview}->add_paragraph ({
1064 fg => [1, 1, 0, 1],
1065 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1066 });
964 1067
965 $self->show; 1068 $self->show;
966 $self 1069 $self
967}; 1070};
968 1071
969sub update_options { 1072sub update_options {
970 my ($self) = @_; 1073 my ($self) = @_;
971 1074
972 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
973 1076
974 $self->{options}->clear; 1077 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1078 $self->{options}->add ($self->{bye_button});
976 1079
977 for my $kw (sort keys %{ $self->{kw} }) { 1080 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1081 $self->{options}->add (new CFPlus::UI::Button
979 text => $kw, 1082 text => $kw,
980 on_activate => sub { 1083 on_activate => sub {
981 $self->send ($kw); 1084 $self->send ($kw);
982 0 1085 0
983 }, 1086 },
984 ); 1087 );
985 } 1088 }
986} 1089}
987 1090
988sub feed { 1091sub feed {
989 my ($self, $data) = @_; 1092 my ($self, $msg) = @_;
990 1093
991 Scalar::Util::weaken $self; 1094 CFPlus::weaken $self;
992 1095
993 my ($type, $msg) = split / /, $data, 2; 1096 if ($msg->{msgtype} eq "reply") {
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
994 1099
995 if ($type eq "msg") { 1100 my $text = "\n" . CFPlus::asxml $msg->{msg};
996 my ($msg, @kw) = split /\x00/, $msg;
997
998 utf8::decode $_ for ($msg, @kw);
999
1000 $self->{kw}{$_} = 1 for @kw;
1001
1002 $msg = "\n" . CFClient::UI::Label::escape $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1102 my @link;
1005 $msg =~ s{ 1103 $text =~ s{
1006 ($match) 1104 ($match)
1007 }{ 1105 }{
1008 my $kw = $1; 1106 my $kw = $1;
1009 1107
1010 push @link, new CFClient::UI::Label 1108 push @link, new CFPlus::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1109 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1110 can_hover => 1,
1013 can_events => 1, 1111 can_events => 1,
1014 padding_x => 0, 1112 padding_x => 0,
1015 padding_y => 0, 1113 padding_y => 0,
1016 on_button_up => sub { 1114 on_button_up => sub {
1017 $self->send ($kw); 1115 $self->send ($kw);
1018 }; 1116 };
1019 1117
1020 chr 0xfffc 1118 "\x{fffc}"
1021 }giex; 1119 }giex;
1022 1120
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1122 $self->{textview}->scroll_to_bottom;
1025 $self->update_options; 1123 $self->update_options;
1026 } else { 1124 } else {
1027 $self->destroy; 1125 $self->destroy;
1028 } 1126 }
… …
1031} 1129}
1032 1130
1033sub send { 1131sub send {
1034 my ($self, $msg) = @_; 1132 my ($self, $msg) = @_;
1035 1133
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1134 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1135 $self->{textview}->scroll_to_bottom;
1038 1136
1039 utf8::encode $msg; 1137 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1041} 1138}
1042 1139
1043sub destroy { 1140sub destroy {
1044 my ($self) = @_; 1141 my ($self) = @_;
1045 1142
1046 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1143 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1047 1144
1145 if ($self->{conn}) {
1048 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1146 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1049 delete $self->{conn}{npc_dialog}; 1147 delete $self->{conn}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1148 $self->{conn}->disconnect_ext ($self->{id});
1149 }
1051 1150
1052 $self->SUPER::destroy; 1151 $self->SUPER::destroy;
1053} 1152}
1054 1153
10551; 11541
1155

Diff Legend

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