| … | |
… | |
| 15 | use Crossfire::Protocol::Base 0.95; |
15 | use Crossfire::Protocol::Base 0.95; |
| 16 | |
16 | |
| 17 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Crossfire::Protocol::Base'; |
| 18 | |
18 | |
| 19 | sub new { |
19 | sub new { |
| 20 | my $class = shift; |
20 | my ($class, %arg) = @_; |
| 21 | |
21 | |
| 22 | 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 | ); |
| 23 | |
30 | |
| 24 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
| 25 | |
32 | |
| 26 | my @cmd_help = map { |
33 | my @cmd_help = map { |
| 27 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
| … | |
… | |
| 41 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
| 42 | @args |
49 | @args |
| 43 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
| 44 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
| 45 | |
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 | ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." }); |
|
|
71 | $self->ask_face ($face, $pri, undef, sub { |
|
|
72 | my $num = $_[0]; |
|
|
73 | my $len = length $_[1]; |
|
|
74 | my ($meta, $data) = unpack "(w/a*)*", $_[1]; |
|
|
75 | |
|
|
76 | CFPlus::DB::write_file $chksum, $data, sub { }; |
|
|
77 | CFPlus::DB::put resmap => $chksum => $meta, sub { }; |
|
|
78 | |
|
|
79 | $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); |
|
|
80 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
|
|
81 | |
|
|
82 | &::audio_music_set ($self->{songs}); |
|
|
83 | }); |
|
|
84 | } |
|
|
85 | |
|
|
86 | push @songs, $self->{music_map}{$face}; |
|
|
87 | --$pri; |
|
|
88 | } |
|
|
89 | |
|
|
90 | &::audio_music_set ($self->{songs} = \@songs); |
|
|
91 | }); |
|
|
92 | |
| 46 | $self->connect_ext (event_capabilities => sub { |
93 | $self->connect_ext (event_capabilities => sub { |
| 47 | my ($cap) = @_; |
94 | my ($cap) = @_; |
| 48 | |
95 | |
| 49 | if (my $ts = $cap->{tileset}) { |
96 | if (my $ts = $cap->{tileset}) { |
| 50 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
97 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
| … | |
… | |
| 55 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
102 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
| 56 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
103 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
| 57 | |
104 | |
| 58 | $self->setup_req (mapsize => "${w}x${h}"); |
105 | $self->setup_req (mapsize => "${w}x${h}"); |
| 59 | } |
106 | } |
|
|
107 | } |
|
|
108 | }); |
|
|
109 | |
|
|
110 | $self->{json_coder} |
|
|
111 | ->convert_blessed |
|
|
112 | ->filter_json_single_key_object (__widget_ref__ => sub { |
|
|
113 | $self->{widget}{$_[0]} |
|
|
114 | }); |
|
|
115 | |
|
|
116 | $self->connect_ext (ws_n => sub { |
|
|
117 | my ($arg) = @_; |
|
|
118 | |
|
|
119 | $self->{widgetset}{$arg{id}} = { |
|
|
120 | w => {}, |
|
|
121 | }; |
|
|
122 | }); |
|
|
123 | |
|
|
124 | $self->connect_ext (ws_d => sub { |
|
|
125 | my ($arg) = @_; |
|
|
126 | |
|
|
127 | my $ws = delete $self->{widgetset}{$arg{id}} |
|
|
128 | or return; |
|
|
129 | |
|
|
130 | $_->destroy |
|
|
131 | for values %{$ws->{w}}; |
|
|
132 | }); |
|
|
133 | |
|
|
134 | $self->connect_ext (ws_c => sub { |
|
|
135 | my ($arg) = @_; |
|
|
136 | |
|
|
137 | my $args = $arg->{args} || {}; |
|
|
138 | |
|
|
139 | for my $ev (grep /^on_/, keys %$args) { |
|
|
140 | $args->{$ev} = sub { |
|
|
141 | my $id = shift->{s_id}; |
|
|
142 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
|
|
143 | |
|
|
144 | 1 |
|
|
145 | }; |
|
|
146 | } |
|
|
147 | |
|
|
148 | if (my $widget = eval { |
|
|
149 | local $SIG{__DIE__}; |
|
|
150 | "CFPlus::UI::$arg->{class}"->new ( |
|
|
151 | %$args, |
|
|
152 | s_ws => $arg->{ws}, |
|
|
153 | s_id => $arg->{id}, |
|
|
154 | ) |
|
|
155 | } |
|
|
156 | ) { |
|
|
157 | $self->{widget}{$arg->{id}} |
|
|
158 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
|
|
159 | = $widget; |
|
|
160 | |
|
|
161 | $widget->connect (on_destroy => sub { |
|
|
162 | my ($widget) = @_; |
|
|
163 | |
|
|
164 | delete $self->{widget}{$widget->{s_id}}; |
|
|
165 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
166 | }); |
|
|
167 | } else { |
|
|
168 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
|
|
169 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
170 | } |
|
|
171 | }); |
|
|
172 | |
|
|
173 | $self->connect_ext (w_c => sub { |
|
|
174 | my ($arg) = @_; |
|
|
175 | |
|
|
176 | my $w = $self->{widget}{$arg->{id}} |
|
|
177 | or return; |
|
|
178 | my $m = $arg->{name}; |
|
|
179 | |
|
|
180 | my $a = $arg->{args} || []; |
|
|
181 | |
|
|
182 | if (exists $arg->{rid}) { |
|
|
183 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); |
|
|
184 | } else { |
|
|
185 | $w->$m (@$a); |
|
|
186 | } |
|
|
187 | }); |
|
|
188 | |
|
|
189 | $self->connect_ext (w_s => sub { |
|
|
190 | my ($arg) = @_; |
|
|
191 | |
|
|
192 | my $w = $self->{widget}{$arg->{id}} |
|
|
193 | or return; |
|
|
194 | |
|
|
195 | $w->{$arg->{name}} = $arg->{value}; |
|
|
196 | }); |
|
|
197 | |
|
|
198 | $self->connect_ext (w_g => sub { |
|
|
199 | my ($arg) = @_; |
|
|
200 | |
|
|
201 | my $w = $self->{widget}{$arg->{id}} |
|
|
202 | or return; |
|
|
203 | |
|
|
204 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
|
|
205 | }); |
|
|
206 | |
|
|
207 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
208 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
209 | $_->destroy |
|
|
210 | for values %{delete $ws->{w} || {}}; |
| 60 | } |
211 | } |
| 61 | }); |
212 | }); |
| 62 | |
213 | |
| 63 | $self->{map_widget}->add_command (@$_) |
214 | $self->{map_widget}->add_command (@$_) |
| 64 | for @cmd_help; |
215 | for @cmd_help; |
| … | |
… | |
| 243 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
394 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
| 244 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
395 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
| 245 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
396 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
| 246 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
397 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
| 247 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
398 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
| 248 | my $rng = $stats->{+CS_STAT_RANGE}; |
399 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
| 249 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
| 250 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
| 251 | my $title = $stats->{+CS_STAT_TITLE}; |
400 | my $title = $stats->{+CS_STAT_TITLE}; |
| 252 | $title =~ s/^Player: //; |
401 | $title =~ s/^Player: //; |
| 253 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
402 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
| 254 | |
403 | |
| 255 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
404 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
| … | |
… | |
| 415 | } while $self->{texture}[$id]; |
564 | } while $self->{texture}[$id]; |
| 416 | |
565 | |
| 417 | CFPlus::DB::get tilecache => $id, sub { |
566 | CFPlus::DB::get tilecache => $id, sub { |
| 418 | my ($data) = @_; |
567 | my ($data) = @_; |
| 419 | |
568 | |
|
|
569 | return unless $self->{map}; # stop when destroyed |
|
|
570 | |
| 420 | $self->set_texture ($id => $data) |
571 | $self->set_texture ($id => $data) |
| 421 | if defined $data; |
572 | if defined $data; |
| 422 | |
573 | |
| 423 | $self->bg_fetch; |
574 | $self->bg_fetch; |
| 424 | }; |
575 | }; |
| 425 | } |
576 | } |
| 426 | |
577 | |
| 427 | sub load_map($$$) { |
578 | sub load_map($$$) { |
| 428 | my ($self, $hash, $x, $y) = @_; |
579 | my ($self, $hash, $x, $y) = @_; |
| 429 | |
580 | |
|
|
581 | my $gen = $self->{map_change_gen}; |
|
|
582 | |
| 430 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
583 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
584 | return unless $gen == $self->{map_change_gen}; |
|
|
585 | |
| 431 | my ($data) = @_; |
586 | my ($data) = @_; |
| 432 | |
587 | |
| 433 | if (defined $data) { |
588 | if (defined $data) { |
| 434 | $data = Compress::LZF::decompress $data; |
589 | $data = Compress::LZF::decompress $data; |
| 435 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
590 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
| 436 | |
591 | |
| 437 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
592 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 438 | push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
593 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
| 439 | $self->bg_fetch unless $inprogress; |
594 | $self->bg_fetch unless $inprogress; |
| 440 | } |
595 | } |
| 441 | }; |
596 | }; |
| 442 | } |
597 | } |
| 443 | |
598 | |
| … | |
… | |
| 510 | |
665 | |
| 511 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
666 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| 512 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
667 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
| 513 | |
668 | |
| 514 | } else { |
669 | } else { |
|
|
670 | my $gen = $self->{map_change_gen}; |
| 515 | $self->send_mapinfo ("spatial $path$tile", sub { |
671 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
672 | return unless $gen == $self->{map_change_gen}; |
|
|
673 | |
| 516 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
674 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 517 | |
675 | |
| 518 | return if $mode ne "spatial"; |
676 | return if $mode ne "spatial"; |
| 519 | |
677 | |
| 520 | $x += $self->{map}->ox; |
678 | $x += $self->{map}->ox; |
| … | |
… | |
| 534 | |
692 | |
| 535 | sub map_change { |
693 | sub map_change { |
| 536 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
694 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 537 | |
695 | |
| 538 | $self->flush_map; |
696 | $self->flush_map; |
|
|
697 | |
|
|
698 | ++$self->{map_change_gen}; |
| 539 | |
699 | |
| 540 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
700 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 541 | |
701 | |
| 542 | my $mapmapw = $self->{mapmap}->{w}; |
702 | my $mapmapw = $self->{mapmap}->{w}; |
| 543 | my $mapmaph = $self->{mapmap}->{h}; |
703 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 583 | if $changed; |
743 | if $changed; |
| 584 | |
744 | |
| 585 | $self->set_texture ($face->{id} => delete $face->{image}); |
745 | $self->set_texture ($face->{id} => delete $face->{image}); |
| 586 | } |
746 | } |
| 587 | |
747 | |
|
|
748 | sub smooth_update { |
|
|
749 | my ($self, $facenum, $face) = @_; |
|
|
750 | |
|
|
751 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
|
|
752 | } |
|
|
753 | |
| 588 | sub set_texture { |
754 | sub set_texture { |
| 589 | my ($self, $id, $data) = @_; |
755 | my ($self, $id, $data) = @_; |
| 590 | |
756 | |
| 591 | $self->{texture}[$id] ||= do { |
757 | $self->{texture}[$id] = my $tex = |
| 592 | my $tex = |
|
|
| 593 | new_from_image CFPlus::Texture |
758 | new_from_image CFPlus::Texture |
| 594 | $data, minify => 1, mipmap => 1; |
759 | $data, minify => 1, mipmap => 1; |
| 595 | |
760 | |
| 596 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
761 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 597 | $self->{map_widget}->update; |
762 | $self->{map_widget}->update; |
| 598 | |
|
|
| 599 | $tex |
|
|
| 600 | }; |
|
|
| 601 | } |
763 | } |
| 602 | |
764 | |
| 603 | sub sound_play { |
765 | sub sound_play { |
| 604 | my ($self, $x, $y, $soundnum, $type) = @_; |
766 | my ($self, $x, $y, $soundnum, $type) = @_; |
| 605 | |
767 | |
| … | |
… | |
| 615 | $LAST_QUERY = $prompt; |
777 | $LAST_QUERY = $prompt; |
| 616 | |
778 | |
| 617 | $self->{query}-> ($self, $flags, $prompt); |
779 | $self->{query}-> ($self, $flags, $prompt); |
| 618 | } |
780 | } |
| 619 | |
781 | |
| 620 | sub drawinfo { |
782 | sub sanitise_xml($) { |
| 621 | my ($self, $color, $text) = @_; |
783 | local $_ = shift; |
| 622 | |
784 | |
| 623 | my @color = ( |
785 | # we now weed out all tags we do not support |
|
|
786 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
787 | # now all entities |
|
|
788 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
789 | |
|
|
790 | # handle some elements |
|
|
791 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
792 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
793 | |
|
|
794 | $_ |
|
|
795 | } |
|
|
796 | |
|
|
797 | our %NAME_TO_COLOR = ( |
|
|
798 | black => 0, |
|
|
799 | white => 1, |
|
|
800 | darkblue => 2, |
|
|
801 | red => 3, |
|
|
802 | orange => 4, |
|
|
803 | lightblue => 5, |
|
|
804 | darkorange => 6, |
|
|
805 | green => 7, |
|
|
806 | darkgreen => 8, |
|
|
807 | grey => 9, |
|
|
808 | brown => 10, |
|
|
809 | yellow => 11, |
|
|
810 | tan => 12, |
|
|
811 | ); |
|
|
812 | |
|
|
813 | our @CF_COLOR = ( |
| 624 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
814 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
| 625 | [1.00, 1.00, 1.00], |
815 | [1.00, 1.00, 1.00], |
| 626 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
816 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
| 627 | [1.00, 0.00, 0.00], |
817 | [1.00, 0.00, 0.00], |
| 628 | [1.00, 0.54, 0.00], |
818 | [1.00, 0.54, 0.00], |
| 629 | [0.11, 0.56, 1.00], |
819 | [0.11, 0.56, 1.00], |
| 630 | [0.93, 0.46, 0.00], |
820 | [0.93, 0.46, 0.00], |
| 631 | [0.18, 0.54, 0.34], |
821 | [0.18, 0.54, 0.34], |
| 632 | [0.56, 0.73, 0.56], |
822 | [0.56, 0.73, 0.56], |
| 633 | [0.80, 0.80, 0.80], |
823 | [0.80, 0.80, 0.80], |
| 634 | [0.75, 0.61, 0.20], |
824 | [0.75, 0.61, 0.20], |
| 635 | [0.99, 0.77, 0.26], |
825 | [0.99, 0.77, 0.26], |
| 636 | [0.74, 0.65, 0.41], |
826 | [0.74, 0.65, 0.41], |
| 637 | ); |
827 | ); |
| 638 | |
828 | |
| 639 | my $fg = $color[$color % @color]; |
829 | sub msg { |
|
|
830 | my ($self, $color, $type, $text, @extra) = @_; |
| 640 | |
831 | |
|
|
832 | $text = sanitise_xml $text; |
|
|
833 | |
|
|
834 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
835 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
836 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
837 | $type =~ s/-/_/g; |
|
|
838 | $self->{$type} = $text; |
|
|
839 | } else { |
| 641 | $self->logprint ("info: ", $text); |
840 | $self->logprint ("msg: ", $text); |
|
|
841 | return if $color < 0; # negative color == ignore if not understood |
| 642 | |
842 | |
|
|
843 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
|
|
844 | |
| 643 | # try to create single paragraphs of multiple lines sent by the server |
845 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
846 | # no longer neecssary with TRT servers |
| 644 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
847 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 645 | |
848 | |
| 646 | $text = CFPlus::asxml $text; |
|
|
| 647 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
|
|
| 648 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
| 649 | |
|
|
| 650 | ::message ({ fg => $fg, markup => $_ }) |
849 | ::message ({ fg => $fg, markup => $_ }) |
| 651 | for split /\n/, $text; |
850 | for split /\n/, $text; |
| 652 | |
851 | |
| 653 | $self->{statusbox}->add ($text, |
852 | $self->{statusbox}->add ($text, |
| 654 | group => $text, |
853 | group => $text, |
| 655 | fg => $fg, |
854 | fg => $fg, |
| 656 | timeout => $color >= 2 ? 180 : 10, |
855 | timeout => $color >= 2 ? 180 : 10, |
| 657 | tooltip_font => $::FONT_FIXED, |
856 | tooltip_font => $::FONT_FIXED, |
| 658 | ); |
857 | ); |
| 659 | } |
858 | } |
| 660 | |
|
|
| 661 | sub drawextinfo { |
|
|
| 662 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
| 663 | |
|
|
| 664 | $self->drawinfo ($color, $message); |
|
|
| 665 | } |
859 | } |
| 666 | |
860 | |
| 667 | sub spell_add { |
861 | sub spell_add { |
| 668 | my ($self, $spell) = @_; |
862 | my ($self, $spell) = @_; |
| 669 | |
863 | |
| … | |
… | |
| 902 | $::SERVER_INFO->set_markup ( |
1096 | $::SERVER_INFO->set_markup ( |
| 903 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1097 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
| 904 | . "protocol version <tt>$self->{version}</tt>\n" |
1098 | . "protocol version <tt>$self->{version}</tt>\n" |
| 905 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1099 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
| 906 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1100 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1101 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 907 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1102 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 908 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1103 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1104 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 909 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1105 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
| 910 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1106 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 911 | . "map size $self->{mapw}×$self->{maph}\n" |
1107 | . "map size $self->{mapw}×$self->{maph}\n" |
| 912 | ); |
1108 | ); |
| 913 | |
1109 | |
| … | |
… | |
| 976 | |
1172 | |
| 977 | (delete $self->{npc_dialog})->destroy |
1173 | (delete $self->{npc_dialog})->destroy |
| 978 | if $self->{npc_dialog}; |
1174 | if $self->{npc_dialog}; |
| 979 | |
1175 | |
| 980 | $self->SUPER::destroy; |
1176 | $self->SUPER::destroy; |
|
|
1177 | |
|
|
1178 | %$self = (); |
| 981 | } |
1179 | } |
| 982 | |
1180 | |
| 983 | package CFPlus::NPCDialog; |
1181 | package CFPlus::NPCDialog; |
| 984 | |
1182 | |
| 985 | our @ISA = 'CFPlus::UI::Toplevel'; |
1183 | our @ISA = 'CFPlus::UI::Toplevel'; |
| … | |
… | |
| 1076 | |
1274 | |
| 1077 | if ($msg->{msgtype} eq "reply") { |
1275 | if ($msg->{msgtype} eq "reply") { |
| 1078 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1276 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
| 1079 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1277 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
| 1080 | |
1278 | |
| 1081 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1279 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
| 1082 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1280 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1083 | my @link; |
1281 | my @link; |
| 1084 | $text =~ s{ |
1282 | $text =~ s{ |
| 1085 | ($match) |
1283 | ($match) |
| 1086 | }{ |
1284 | }{ |
