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.198 by root, Tue May 20 02:49:56 2008 UTC vs.
Revision 1.224 by root, Wed Nov 7 00:25:46 2012 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict; 4
5use Guard ();
5 6
6use Deliantra::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use DC; 9use DC;
9use DC::DB; 10use DC::DB;
… …
12use DC::Macro; 13use DC::Macro;
13use DC::Item; 14use DC::Item;
14 15
15use base 'Deliantra::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
16 17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
25
17sub new { 26sub new {
18 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
19 28
20 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
21 setup_req => { 30 setup_req => {
22 extmap => 1, 31 extmap => 1,
23 excmd => 1,
24 widget => 2, 32 widget => 2,
25 %{$arg{setup_req} || {}}, 33 %{$arg{setup_req} || {}},
26 }, 34 },
27 ); 35 );
36
37 $self->update_fx_want;
38
39 my $exp_guard = $self->addme_guard;
40 my $skl_guard = $self->addme_guard;
41 my $spl_guard = $self->addme_guard;
42 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
43 my ($exp, $skl, $spl) = @_;
44
45 $self->register_face_handler ($exp, sub {
46 my ($face) = @_;
47
48 undef $exp_guard;
49 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
50 $_->() for values %{ $self->{on_exp_update} };
51 });
52
53 $self->register_face_handler ($skl, sub {
54 my ($face) = @_;
55
56 undef $skl_guard;
57 my $info = $self->{json_coder}->decode (delete $face->{data});
58 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
59 });
60
61 $self->register_face_handler ($spl, sub {
62 my ($face) = @_;
63
64 undef $spl_guard;
65 my $info = $self->{json_coder}->decode (delete $face->{data});
66 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
67 });
68
69 ()
70 });
28 71
29 $self->{map_widget}->clr_commands; 72 $self->{map_widget}->clr_commands;
30 73
31 my @cmd_help = map { 74 my @cmd_help = map {
32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 75 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
67 for values %{delete $ws->{w} || {}}; 110 for values %{delete $ws->{w} || {}};
68 } 111 }
69 112
70 delete $self->{items}; 113 delete $self->{items};
71 $::INV->clear; 114 $::INV->clear;
115 $::INVR->clear;
72 $::INVR_HB->clear; 116 $::INVR_HB->clear;
73 $::FLOORBOX->clear; 117 $::FLOORBOX->clear;
74 }); 118 });
75 119
76 $self->{map_widget}->add_command (@$_) 120 $self->{map_widget}->add_command (@$_)
77 for @cmd_help; 121 for @cmd_help;
78 122
79 { 123 {
80 $self->{dialogue} = my $tex = new_from_file DC::Texture 124 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
81 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
82 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 125 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
83 } 126 }
84 127
85 { 128 {
86 $self->{noface} = my $tex = new_from_file DC::Texture 129 $self->{noface} = my $tex = $TEX_NOFACE;
87 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
88 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 130 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
89 } 131 }
132
133# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
134# $self->{expire_w} = AE::timer 1, 1, sub {
135# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
136#
137# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
138# warn DC::SvREFCNT $self->{texture}[$_];
139# $self->{texture}[$_]->unload;
140# warn "expire texture $_\n";#d#
141# }
142#
143# ($self->{expire_count} += $count) < @{ $self->{texture} }
144# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
145# warn "count is $count\n";#d#
146# };
90 147
91 $self->{open_container} = 0; 148 $self->{open_container} = 0;
92 149
93 # per server 150 # per server
94 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 151 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
… …
106 }); 163 });
107} 164}
108 165
109sub ext_capabilities { 166sub ext_capabilities {
110 my ($self, %cap) = @_; 167 my ($self, %cap) = @_;
111
112 $self->update_fx_want;
113
114 $self->send_exti_req (resource => "exp_table", sub {
115 my ($exp_table) = @_;
116
117 $self->register_face_handler ($exp_table, sub {
118 my ($face) = @_;
119
120 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
121 $_->() for values %{ $self->{on_exp_update} || {} };
122 });
123
124 ()
125 });
126 168
127 if (my $ts = $cap{tileset}) { 169 if (my $ts = $cap{tileset}) {
128 if (my ($default) = grep $_->[2] & 1, @$ts) { 170 if (my ($default) = grep $_->[2] & 1, @$ts) {
129 $self->{tileset} = $default; 171 $self->{tileset} = $default;
130 $self->{tilesize} = $default->[3]; 172 $self->{tilesize} = $default->[3];
… …
255 my %wkw = ( 297 my %wkw = (
256 root => $DC::UI::ROOT, 298 root => $DC::UI::ROOT,
257 tooltip => $DC::UI::TOOLTIP, 299 tooltip => $DC::UI::TOOLTIP,
258 300
259 mapwidget => $::MAPWIDGET, 301 mapwidget => $::MAPWIDGET,
302 menubar => $::MENUBAR,
303 menupopup => $::MENUPOPUP,
304 pickup_enable => $::PICKUP_ENABLE,
260 buttonbar => $::BUTTONBAR, 305 buttonbar => $::BUTTONBAR,
261 metaserver => $::METASERVER, 306 metaserver => $::METASERVER,
262 buttonbar => $::BUTTONBAR, 307 buttonbar => $::BUTTONBAR,
263 login_button => $::LOGIN_BUTTON, 308 login_button => $::LOGIN_BUTTON,
264 quit_dialog => $::QUIT_DIALOG, 309 quit_dialog => $::QUIT_DIALOG,
… …
281 326
282 floorbox => $::FLOORBOX, 327 floorbox => $::FLOORBOX,
283 help_window => $::HELP_WINDOW, 328 help_window => $::HELP_WINDOW,
284 message_window => $::MESSAGE_WINDOW, 329 message_window => $::MESSAGE_WINDOW,
285 message_dist => $::MESSAGE_DIST, 330 message_dist => $::MESSAGE_DIST,
286 statusbox => $::SDTATUSBOX, 331 statusbox => $::STATUSBOX,
287 332
288 inv => $::INV, 333 inv => $::INV,
289 invr => $::INVR, 334 invr => $::INVR,
290 invr_hb => $::INVR_HB, 335 invr_hb => $::INVR_HB,
291 ); 336 );
… …
375 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 420 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
376 : () 421 : ()
377 } 422 }
378 sort { $a <=> $b } keys %{$self->{spell_paths}}; 423 sort { $a <=> $b } keys %{$self->{spell_paths}};
379 424
380 join "", @diff 425 "\u$name: " . (join ", ", @diff)
381} 426}
382 427
383# all stats that are chacked against changes 428# all stats that are chacked against changes
384my @statchange = ( 429my @statchange = (
385 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 430 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
428 473
429 if (my @diffs = 474 if (my @diffs =
430 ( 475 (
431 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 476 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
432 map { 477 map {
433 $stats->{$_} && $prev->{$_} 478 $stats->{$_} && $prev->{$_}
434 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 479 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
435 } sort { $a <=> $b } keys %{$self->{skill_info}} 480 } sort { $a <=> $b } keys %{$self->{skill_info}}
436 ) 481 )
437 ) { 482 ) {
438 my $msg = join " ", @diffs; 483 my $msg = join " ", @diffs;
… …
440 } 485 }
441 486
442 if ( 487 if (
443 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 488 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
444 ) { 489 ) {
445 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 490 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
446 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 491 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
447 } 492 }
448 493
449 $self->update_stats_window ($stats, $prev); 494 $self->update_stats_window ($stats, $prev);
450 495
… …
488 533
489 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 534 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
490 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 535 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
491 $::GAUGES->{food} ->set_value ($fo, $fo_m); 536 $::GAUGES->{food} ->set_value ($fo, $fo_m);
492 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 537 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
493 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 538 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
494 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 539 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
495 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 540 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
496 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 541 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
497 my $title = $stats->{+CS_STAT_TITLE}; 542 my $title = $stats->{+CS_STAT_TITLE};
498 $title =~ s/^Player: //; 543 $title =~ s/^Player: //;
499 $::STATWIDS->{title} ->set_text ("Title: " . $title); 544 $::STATWIDS->{title} ->set_text ("Title: " . $title);
500 545
… …
512 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 557 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
513 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 558 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
514 559
515 $self->update_weight; 560 $self->update_weight;
516 561
517 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 562 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
518 for keys %RES_TBL; 563 for keys %RES_TBL;
519 564
520 my $sktbl = $::STATWIDS->{skill_tbl}; 565 my $sktbl = $::STATWIDS->{skill_tbl};
521 my @skills = keys %{ $self->{skill_info} }; 566 my @skills = keys %{ $self->{skill_info} };
522 567
… …
541 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), 586 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
542 ]; 587 ];
543 588
544 my @add = @$sw; 589 my @add = @$sw;
545 590
546 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 591 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
547 592
548 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 593 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
549 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 594 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
550 595
551 my ($x, $y) = (0, 1); 596 my ($x, $y) = (0, 1);
… …
613 my $sw = $self->{skillwid}{$idx}; 658 my $sw = $self->{skillwid}{$idx};
614 $sw->[0]->set_text (::formsep ($val->[1])); 659 $sw->[0]->set_text (::formsep ($val->[1]));
615 $sw->[1]->set_text ($val->[0] * 1); 660 $sw->[1]->set_text ($val->[0] * 1);
616 $sw->[2]->set_value (@$val); 661 $sw->[2]->set_value (@$val);
617 662
618 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 663 $::GAUGES->{skillexp}->set_label ("$name %d%%");
619 $::GAUGES->{sklprg}->set_value (@$val); 664 $::GAUGES->{skillexp}->set_value (@$val);
620 } 665 }
621} 666}
622 667
623sub user_send { 668sub user_send {
624 my ($self, $command) = @_; 669 my ($self, $command) = @_;
… …
637} 682}
638 683
639sub map_scroll { 684sub map_scroll {
640 my ($self, $dx, $dy) = @_; 685 my ($self, $dx, $dy) = @_;
641 686
642 $self->{map}->scroll ($dx, $dy); 687 $self->{map_widget}->scroll ($dx, $dy);
643} 688}
644 689
645sub feed_map1a { 690sub feed_map1a {
646 my ($self, $data) = @_; 691 my ($self, $data) = @_;
647 692
648 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 693 my $missing = $self->{map}->map1a_update ($data);
649 my $delay; 694 my $delay;
650 695
651 for my $tile (@$missing) { 696 for my $tile (@$missing) {
652 next if $self->{delay}{$tile}; 697 next if $self->{delay}{$tile};
653 698
654 $delay = 1; 699 $delay = 1;
655 700
656 if (my $tex = $::CONN->{texture}[$tile]) { 701 if (my $tex = $self->{texture}[$tile]) {
657 $tex->upload; 702 $tex->upload;
658 } else { 703 } else {
659 $self->{delay}{$tile} = 1; 704 $self->{delay}{$tile} = 1;
660 705
661 # we assume the face is in-flight and will eventually come 706 # we assume the face is in-flight and will eventually arrive
662 push @{$self->{tile_cb}{$tile}}, sub { 707 push @{$self->{tile_cb}{$tile}}, sub {
663 delete $self->{delay}{$tile}; 708 delete $self->{delay}{$tile};
664 $_[0]->upload; 709 $_[0]->upload;
665 }; 710 };
666 } 711 }
667 } 712 }
668 713
669 if ($delay) { 714 if ($delay) {
670 # delay the map drawing a tiny bit in the hope of getting the missing fetched 715 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
671 EV::once undef, 0, 0.03, sub { 716 EV::once undef, 0, 0.03, sub {
672 $self->{map_widget}->update 717 $self->{map_widget}->update
673 if $self->{map_widget}; 718 if $self->{map_widget};
674 }; 719 };
675 } else { 720 } else {
… …
963 1008
964 my $tex = $self->{texture}[$tile] ||= 1009 my $tex = $self->{texture}[$tile] ||=
965 new DC::Texture 1010 new DC::Texture
966 tile => $tile, 1011 tile => $tile,
967 image => $data, delete_image => 1, 1012 image => $data, delete_image => 1,
968 minify => 1, mipmap => 1; 1013 minify => 1;
969 1014
970 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1015 if (my $cbs = delete $self->{tile_cb}{$tile}) {
971 $_->($tex) for @$cbs; 1016 $_->($tex) for @$cbs;
972 } 1017 }
973} 1018}
… …
978 my ($self, $num, $cb) = @_; 1023 my ($self, $num, $cb) = @_;
979 1024
980 push @{$self->{face_cb}{$num}}, $cb; 1025 push @{$self->{face_cb}{$num}}, $cb;
981 1026
982 defined wantarray 1027 defined wantarray
983 ? DC::guard { 1028 ? Guard::guard {
984 @{$self->{face_cb}{$num}} 1029 @{$self->{face_cb}{$num}}
985 = grep $_ != $cb, 1030 = grep $_ != $cb,
986 @{$self->{face_cb}{$num}}; 1031 @{$self->{face_cb}{$num}};
987 } 1032 }
988 : () 1033 : ()
… …
1016 my ($self, $flags, $prompt) = @_; 1061 my ($self, $flags, $prompt) = @_;
1017 1062
1018 $prompt = $LAST_QUERY unless length $prompt; 1063 $prompt = $LAST_QUERY unless length $prompt;
1019 $LAST_QUERY = $prompt; 1064 $LAST_QUERY = $prompt;
1020 1065
1021 $self->{query}-> ($self, $flags, $prompt); 1066 $self->{query}->($self, $flags, $prompt);
1022} 1067}
1023 1068
1024sub sanitise_xml($) { 1069sub sanitise_xml($) {
1025 local $_ = shift; 1070 local $_ = shift;
1026 1071
… …
1058 tan => 12, 1103 tan => 12,
1059); 1104);
1060 1105
1061our @CF_COLOR = ( 1106our @CF_COLOR = (
1062 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1107 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1063 [1.00, 1.00, 1.00], 1108 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1064 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1109 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
1065 [1.00, 0.00, 0.00], 1110 [1.00, 0.00, 0.00],
1066 [1.00, 0.54, 0.00], 1111 [1.00, 0.54, 0.00],
1067 [0.11, 0.56, 1.00], 1112 [0.11, 0.56, 1.00],
1068 [0.93, 0.46, 0.00], 1113 [0.93, 0.46, 0.00],
1069 [0.18, 0.54, 0.34], 1114 [0.18, 0.54, 0.34],
… …
1088 $self->logprint ("msg: ", $text); 1133 $self->logprint ("msg: ", $text);
1089 return if $color < 0; # negative color == ignore if not understood 1134 return if $color < 0; # negative color == ignore if not understood
1090 1135
1091 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1136 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1092 1137
1093 ## try to create single paragraphs of multiple lines sent by the server
1094 # no longer neecssary with TRT servers
1095 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1096
1097 for (split /\n/, $text) {
1098 ::message ({ 1138 ::message ({
1099 fg => $fg, 1139 fg => $fg,
1100 markup => $_, 1140 markup => $text,
1101 type => $type, 1141 type => $type,
1102 extra => [@extra], 1142 extra => [@extra],
1103 color_flags => $color, #d# ugly, kill 1143 color_flags => $color, #d# ugly, kill
1104 }); 1144 });
1105 1145
1106 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1146# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1107 # actually, this is an ugly design. _we_ should control the channels, 1147# # actually, this is an ugly design. _we_ should control the channels,
1108 # not some random other widget, as the channels are clearly protocol-specific. 1148# # not some random other widget, as the channels are clearly protocol-specific.
1109 # then we could also react to flags such as CLEAR without resorting to 1149# # then we could also react to flags such as CLEAR without resorting to
1110 # hacks such as color_flags, above. 1150# # hacks such as color_flags, above.
1111 }
1112 1151
1113 $self->{statusbox}->add ($text, 1152 $self->{statusbox}->add ($text,
1114 group => $text, 1153 group => $text,
1115 fg => $fg, 1154 fg => $fg,
1116 timeout => $color >= 2 ? 180 : 10, 1155 timeout => $color >= 2 ? 180 : 10,
… …
1323sub update_server_info { 1362sub update_server_info {
1324 my ($self) = @_; 1363 my ($self) = @_;
1325 1364
1326 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1365 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1327 1366
1367 my $version = JSON::XS->new->encode ($self->{s_version});
1368
1328 $::SERVER_INFO->set_markup ( 1369 $::SERVER_INFO->set_markup (
1329 "server <tt>$self->{host}:$self->{port}</tt>\n" 1370 "server <tt>$self->{host}:$self->{port}</tt>\n"
1330 . "protocol version <tt>$self->{version}</tt>\n" 1371 . "protocol version <tt>$version</tt>\n"
1331 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1332 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1333 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1334 . "editing support $yesno[!!$self->{editor_support}]\n" 1372 . "editing support $yesno[!!$self->{editor_support}]\n"
1335 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1336 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1337 . "client support $yesno[$self->{cfplus_ext} > 0]" 1373 . "client support $yesno[$self->{cfplus_ext} > 0]"
1338 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1374 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1339 . "map size $self->{mapw}×$self->{maph}\n" 1375 . "map size $self->{mapw}×$self->{maph}\n"
1340 ); 1376 );
1341 1377
… …
1363 }); 1399 });
1364 1400
1365 $self->update_server_info; 1401 $self->update_server_info;
1366 1402
1367 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1403 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1368 $self->send_command ("pickup $::CFG->{pickup}"); 1404 $self->send_pickup ($::CFG->{pickup});
1369} 1405}
1370 1406
1371sub lookat { 1407sub lookat {
1372 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1373 1409
… …
1375 $self->send_ext_req (lookat => $x, $y, sub { 1411 $self->send_ext_req (lookat => $x, $y, sub {
1376 my (%msg) = @_; 1412 my (%msg) = @_;
1377 1413
1378 if (exists $msg{npc_dialog}) { 1414 if (exists $msg{npc_dialog}) {
1379 # start npc chat dialog 1415 # start npc chat dialog
1380 $self->{npc_dialog} = new DC::NPCDialog:: 1416 $self->{w}{npc_dialog} = new DC::NPCDialog::
1381 token => $msg{npc_dialog}, 1417 token => $msg{npc_dialog},
1382 title => "$msg{npc_dialog}[0] (NPC)", 1418 title => "$msg{npc_dialog}[0] (NPC)",
1383 conn => $self, 1419 conn => $self,
1384 ; 1420 ;
1385 } 1421 }
… …
1390} 1426}
1391 1427
1392sub destroy { 1428sub destroy {
1393 my ($self) = @_; 1429 my ($self) = @_;
1394 1430
1395 (delete $self->{npc_dialog})->destroy 1431 $_->destroy
1396 if $self->{npc_dialog}; 1432 for values %{ $self->{w} };
1397 1433
1398 $self->SUPER::destroy; 1434 $self->SUPER::destroy;
1399 1435
1400 %$self = (); 1436 %$self = ();
1401} 1437}
… …
1537} 1573}
1538 1574
1539sub send { 1575sub send {
1540 my ($self, $msg) = @_; 1576 my ($self, $msg) = @_;
1541 1577
1542 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); 1578 $self->{textview}->add_paragraph ({
1579 markup =>
1580 "\n<span foreground='#ffff00'><b>"
1581 . (DC::asxml $msg)
1582 . "</b></span>"
1583 });
1543 $self->{textview}->scroll_to_bottom; 1584 $self->{textview}->scroll_to_bottom;
1544 1585
1545 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1586 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1546} 1587}
1547 1588
… …
1550 1591
1551 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1592 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1552 1593
1553 if ($self->{conn}) { 1594 if ($self->{conn}) {
1554 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1595 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1555 delete $self->{conn}{npc_dialog}; 1596 delete $self->{conn}{w}{npc_dialog};
1556 $self->{conn}->disconnect_ext ($self->{id}); 1597 $self->{conn}->disconnect_ext ($self->{id});
1557 } 1598 }
1558 1599
1559 $self->SUPER::destroy; 1600 $self->SUPER::destroy;
1560} 1601}

Diff Legend

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