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.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.114 by root, Thu Jul 12 18:28:34 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;
11use CFPlus::Macro; 12use CFPlus::Macro;
12use CFPlus::Item; 13use CFPlus::Item;
13 14
14use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
15 16
16use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my ($class, %arg) = @_;
20 21
21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
22 30
23 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
24 32
25 my @cmd_help = map { 33 my @cmd_help = map {
26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
37 for @args; 45 for @args;
38 46
39 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
40 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args 49 @args
42 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
44 52
53 $self->connect_ext (event_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 my $pri = -100;
63 for my $face (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) {
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 resmap => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, $pri, undef, sub {
79 my $num = $_[0];
80 my $len = length $_[1];
81 my ($meta, $data) = unpack "(w/a*)*", $_[1];
82
83 CFPlus::DB::write_file $chksum, $data, sub { };
84 CFPlus::DB::put resmap => $chksum => $meta, sub { };
85
86 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
87 ::message ({ markup => "downloaded song #$face, size $len octets" });
88
89 &::audio_music_set ($self->{songs});
90 });
91 }
92 }
93 }
94
95 push @songs, $self->{music_map}{$face};
96 --$pri;
97 }
98
99 &::audio_music_set ($self->{songs} = \@songs);
100 });
101
102 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_;
104
105 if (my $ts = $cap->{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]);
110
111 my $w = int $self->{mapw} * 32 / $self->{tilesize};
112 my $h = int $self->{maph} * 32 / $self->{tilesize};
113
114 $self->setup_req (mapsize => "${w}x${h}");
115 }
116 }
117 });
118
119 $self->{json_coder}
120 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub {
122 $self->{widget}{$_[0]}
123 });
124
125 $self->connect_ext (ws_n => sub {
126 my ($arg) = @_;
127
128 $self->{widgetset}{$arg{id}} = {
129 w => {},
130 };
131 });
132
133 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_;
135
136 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return;
138
139 $_->destroy
140 for values %{$ws->{w}};
141 });
142
143 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_;
145
146 my $args = $arg->{args} || {};
147
148 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub {
150 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
152
153 1
154 };
155 }
156
157 if (my $widget = eval {
158 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new (
160 %$args,
161 s_ws => $arg->{ws},
162 s_id => $arg->{id},
163 )
164 }
165 ) {
166 $self->{widget}{$arg->{id}}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
168 = $widget;
169
170 $widget->connect (on_destroy => sub {
171 my ($widget) = @_;
172
173 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 });
176 } else {
177 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 }
180 });
181
182 $self->connect_ext (w_c => sub {
183 my ($arg) = @_;
184
185 my $w = $self->{widget}{$arg->{id}}
186 or return;
187 my $m = $arg->{name};
188
189 my $a = $arg->{args} || [];
190
191 if (exists $arg->{rid}) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
193 } else {
194 $w->$m (@$a);
195 }
196 });
197
198 $self->connect_ext (w_s => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $w->{$arg->{name}} = $arg->{value};
205 });
206
207 $self->connect_ext (w_g => sub {
208 my ($arg) = @_;
209
210 my $w = $self->{widget}{$arg->{id}}
211 or return;
212
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
214 });
215
216 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
217 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy
219 for values %{delete $ws->{w} || {}};
220 }
221 });
222
45 $self->{map_widget}->add_command (@$_) 223 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 224 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 225
51 { 226 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 227 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 228 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 229 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 230 }
56 231
232 {
233 $self->{noface} = my $tex = new_from_file CFPlus::Texture
234 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
235 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
236 }
237
57 $self->{open_container} = 0; 238 $self->{open_container} = 0;
58 239
59 # "global"
60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
64
65 # per server 240 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 241 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 242
69 $self 243 $self
70} 244}
71 245
72sub logprint { 246sub logprint {
… …
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 403 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 404 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 405 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 406 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 407 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 408 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
235 $rng =~ s/^Range: //; # thank you so much dear server
236 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
237 my $title = $stats->{+CS_STAT_TITLE}; 409 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 410 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 411 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 412
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 413 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
374 or return; 546 or return;
375 547
376 my ($hash, $x, $y, $w, $h) = @$map_info; 548 my ($hash, $x, $y, $w, $h) = @$map_info;
377 549
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 550 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 551 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 552 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 553}
382 554
383sub map_clear { 555sub map_clear {
384 my ($self) = @_; 556 my ($self) = @_;
… …
388 560
389 $self->{map}->clear; 561 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 562 delete $self->{map_widget}{magicmap};
391} 563}
392 564
565sub bg_fetch {
566 my ($self) = @_;
567
568 my $id;
569
570 do {
571 $id = pop @{$self->{bg_fetch}}
572 or return;
573 } while $self->{texture}[$id];
574
575 CFPlus::DB::get tilecache => $id, sub {
576 my ($data) = @_;
577
578 return unless $self->{map}; # stop when destroyed
579
580 $self->set_texture ($id => $data)
581 if defined $data;
582
583 $self->bg_fetch;
584 };
585}
393 586
394sub load_map($$$) { 587sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 588 my ($self, $hash, $x, $y) = @_;
396 589
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 590 my $gen = $self->{map_change_gen};
591
592 CFPlus::DB::get $self->{mapcache} => $hash, sub {
593 return unless $gen == $self->{map_change_gen};
594
595 my ($data) = @_;
596
597 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 598 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 599 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
400 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
401 my $data = $self->{tilecache}->get ($id)
402 or next;
403 600
404 $self->set_texture ($id => $data); 601 my $inprogress = @{ $self->{bg_fetch} || [] };
602 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
603 $self->bg_fetch unless $inprogress;
405 } 604 }
406 } 605 };
407} 606}
408 607
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 608# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 609# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 610# the right fix is to make real tiled maps with an overview file
… …
475 674
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 675 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 676 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 677
479 } else { 678 } else {
679 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 680 $self->send_mapinfo ("spatial $path$tile", sub {
681 return unless $gen == $self->{map_change_gen};
682
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 683 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 684
483 return if $mode ne "spatial"; 685 return if $mode ne "spatial";
484 686
485 $x += $self->{map}->ox; 687 $x += $self->{map}->ox;
… …
499 701
500sub map_change { 702sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 703 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 704
503 $self->flush_map; 705 $self->flush_map;
706
707 ++$self->{map_change_gen};
504 708
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 709 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 710
507 my $mapmapw = $self->{mapmap}->{w}; 711 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 712 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 729 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 730 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 731}
528 732
529sub face_find { 733sub face_find {
530 my ($self, $facenum, $face) = @_; 734 my ($self, $facenum, $face, $cb) = @_;
531 735
532 my $hash = "$face->{chksum},$face->{name}"; 736 my $hash = "$face->{chksum},$face->{name}";
533 737
534 my $id = $self->{facemap}->get ($hash); 738 my $id = CFPlus::DB::get_tile_id_sync $hash;
535 739
536 unless ($id) {
537 # create new id for face
538 # I love transactions
539 for (1..100) {
540 my $txn = $CFPlus::DB_ENV->txn_begin;
541 my $status = $self->{facemap}->db_get (id => $id);
542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
543 $id = ($id || 64) + 1;
544 if ($self->{facemap}->put (id => $id) == 0
545 && $self->{facemap}->put ($hash => $id) == 0) {
546 $txn->txn_commit;
547
548 goto gotid;
549 }
550 }
551 $txn->txn_abort;
552 }
553
554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
555 }
556
557gotid:
558 $face->{id} = $id; 740 $face->{id} = $id;
559 $self->{map}->set_face ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d# 741 $self->{faceid}[$facenum] = $id;
561 742
562 my $face = $self->{tilecache}->get ($id); 743 $self->{map}->set_tileid ($facenum => $id);
563 744
564 if ($face) { 745 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch;
566 $face
567 } else {
568 my $tex = $self->{noface};
569 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570 undef
571 };
572} 746}
573 747
574sub face_update { 748sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 749 my ($self, $facenum, $face, $changed) = @_;
576 750
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
752 if $changed;
578 753
579 $self->set_texture ($face->{id} => delete $face->{image}); 754 $self->set_texture ($face->{id} => delete $face->{image});
755}
756
757sub smooth_update {
758 my ($self, $facenum, $face) = @_;
759
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 761}
581 762
582sub set_texture { 763sub set_texture {
583 my ($self, $id, $data) = @_; 764 my ($self, $id, $data) = @_;
584 765
585 $self->{texture}[$id] ||= do { 766 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 767 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 768 $data, minify => 1, mipmap => 1;
589 769
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 771 $self->{map_widget}->update;
592
593 $tex
594 };
595} 772}
596 773
597sub sound_play { 774sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 775 my ($self, $x, $y, $soundnum, $type) = @_;
599 776
… …
609 $LAST_QUERY = $prompt; 786 $LAST_QUERY = $prompt;
610 787
611 $self->{query}-> ($self, $flags, $prompt); 788 $self->{query}-> ($self, $flags, $prompt);
612} 789}
613 790
614sub drawinfo { 791sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 792 local $_ = shift;
616 793
617 my @color = ( 794 # we now weed out all tags we do not support
795 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
796 # now all entities
797 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
798
799 # handle some elements
800 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
801 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
802
803 $_
804}
805
806our %NAME_TO_COLOR = (
807 black => 0,
808 white => 1,
809 darkblue => 2,
810 red => 3,
811 orange => 4,
812 lightblue => 5,
813 darkorange => 6,
814 green => 7,
815 darkgreen => 8,
816 grey => 9,
817 brown => 10,
818 yellow => 11,
819 tan => 12,
820);
821
822our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 823 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 824 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 825 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 826 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 827 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 828 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 829 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 830 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 831 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 832 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 833 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 834 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 835 [0.74, 0.65, 0.41],
631 ); 836);
632 837
633 my $fg = $color[$color % @color]; 838sub msg {
839 my ($self, $color, $type, $text, @extra) = @_;
634 840
841 $text = sanitise_xml $text;
842
843 if (my $cb = $self->{cb_msg}{$type}) {
844 $_->($self, $color, $type, $text, @extra) for values %$cb;
845 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
846 $type =~ s/-/_/g;
847 $self->{$type} = $text;
848 } else {
635 $self->logprint ("info: ", $text); 849 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood
636 851
852 my $fg = $CF_COLOR[$color % @CF_COLOR];
853
637 # try to create single paragraphs of multiple lines sent by the server 854 ## try to create single paragraphs of multiple lines sent by the server
855 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 856 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 857
640 $text = CFPlus::asxml $text;
641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
643
644 ::message ({ fg => $fg, markup => $_ }) 858 ::message ({ fg => $fg, markup => $_ })
645 for split /\n/, $text; 859 for split /\n/, $text;
646 860
647 $self->{statusbox}->add ($text, 861 $self->{statusbox}->add ($text,
648 group => $text, 862 group => $text,
649 fg => $fg, 863 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 864 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 865 tooltip_font => $::FONT_FIXED,
652 ); 866 );
653} 867 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 868}
660 869
661sub spell_add { 870sub spell_add {
662 my ($self, $spell) = @_; 871 my ($self, $spell) = @_;
663 872
… …
679} 888}
680 889
681sub setup { 890sub setup {
682 my ($self, $setup) = @_; 891 my ($self, $setup) = @_;
683 892
893 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 894 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 895}
686 896
687sub addme_success { 897sub addme_success {
688 my ($self) = @_; 898 my ($self) = @_;
… …
895 $::SERVER_INFO->set_markup ( 1105 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1106 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1107 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1108 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1109 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1110 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1111 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1112 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1113 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1116 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1117 );
906 1118
… …
928 1140
929 $self->update_server_info; 1141 $self->update_server_info;
930 1142
931 $self->send_command ("output-sync $::CFG->{output_sync}"); 1143 $self->send_command ("output-sync $::CFG->{output_sync}");
932 $self->send_command ("output-count $::CFG->{output_count}"); 1144 $self->send_command ("output-count $::CFG->{output_count}");
1145 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
933 $self->send_command ("pickup $::CFG->{pickup}"); 1146 $self->send_command ("pickup $::CFG->{pickup}");
934} 1147}
935 1148
936sub buildat { 1149sub buildat {
937 my ($self, $builditem, $x, $y) = @_; 1150 my ($self, $builditem, $x, $y) = @_;
… …
968 1181
969 (delete $self->{npc_dialog})->destroy 1182 (delete $self->{npc_dialog})->destroy
970 if $self->{npc_dialog}; 1183 if $self->{npc_dialog};
971 1184
972 $self->SUPER::destroy; 1185 $self->SUPER::destroy;
1186
1187 %$self = ();
973} 1188}
974 1189
975package CFPlus::NPCDialog; 1190package CFPlus::NPCDialog;
976 1191
977our @ISA = 'CFPlus::UI::Toplevel'; 1192our @ISA = 'CFPlus::UI::Toplevel';
… …
1068 1283
1069 if ($msg->{msgtype} eq "reply") { 1284 if ($msg->{msgtype} eq "reply") {
1070 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1071 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1072 1287
1073 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1074 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1075 my @link; 1290 my @link;
1076 $text =~ s{ 1291 $text =~ s{
1077 ($match) 1292 ($match)
1078 }{ 1293 }{

Diff Legend

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