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.163 by root, Wed Aug 22 21:17:32 2007 UTC vs.
Revision 1.185 by root, Thu Dec 27 19:12:19 2007 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 xwidget1 => 1,#d# 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52 50
53 $self->{json_coder} 51 $self->{json_coder}
54 ->convert_blessed 52 ->convert_blessed
55 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
57 }); 61 });
58 62
59 # destroy widgets on logout 63 # destroy widgets on logout
60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
61 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
66 70
67 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
68 for @cmd_help; 72 for @cmd_help;
69 73
70 { 74 {
71 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
72 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
73 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
74 } 78 }
75 79
76 { 80 {
77 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
78 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 } 84 }
81 85
82 $self->{open_container} = 0; 86 $self->{open_container} = 0;
83 87
… …
98} 102}
99 103
100sub ext_capabilities { 104sub ext_capabilities {
101 my ($self, %cap) = @_; 105 my ($self, %cap) = @_;
102 106
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want; 107 $self->update_fx_want;
105 108
106 $self->send_exti_req (resource => "exp_table", sub { 109 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_; 110 my ($exp_table) = @_;
108 111
… …
138############################################################################# 141#############################################################################
139 142
140sub widget_associate { 143sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_; 144 my ($self, $ws, $id, $widget) = @_;
142 145
143 if ($widget) { 146 $widget ||= new DC::UI::Bin;
147
144 $widget->{s_id} = $id; 148 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget; 149 $self->{widget}{$id} = $widget;
146 150
147 if ($ws) { 151 if ($ws) {
148 $widget->{s_ws} = $ws; 152 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget; 153 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 } 154 }
151 155
152 $widget->connect (on_destroy => sub { 156 $widget->connect (on_destroy => sub {
153 my ($widget) = @_; 157 my ($widget) = @_;
154 158
155 delete $self->{widget}{$widget->{s_id}}; 159 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} 160 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws}; 161 if exists $widget->{s_ws};
158 }); 162 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166} 163}
167 164
168# widgetset new 165# widgetset new
169sub ext_ws_n { 166sub ext_ws_n {
170 my ($self, $id) = @_; 167 my ($self, $id) = @_;
… …
187 184
188# widgetset create 185# widgetset create
189sub ext_ws_c { 186sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_; 187 my ($self, $ws, $id, $class, $args) = @_;
191 188
192 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate ( 189 $self->widget_associate (
203 $ws, $id => scalar eval { 190 $ws, $id => scalar eval {
204 local $SIG{__DIE__}; 191 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args) 192 "DC::UI::$class"->new (%$args)
193 }
194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
206 } 225 @w
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $parse_list->($template);
231 $done_cb->();
232 } elsif ($type eq "face") {
233 #...
234 $done_cb->(0);
235 } else {
236 $done_cb->(0);
237 }
208} 238}
209 239
210# widgetset associate 240# widgetset associate
211sub ext_ws_a { 241sub ext_ws_a {
212 my ($self, %ass) = @_; 242 my ($self, %ass) = @_;
213 243
214 # everything that has a name, wether conceivably useful or not 244 # everything that has a name, wether conceivably useful or not
215 my %wkw = ( 245 my %wkw = (
216 root => $CFPlus::UI::ROOT, 246 root => $DC::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP, 247 tooltip => $DC::UI::TOOLTIP,
218 248
219 mapwidget => $::MAPWIDGET, 249 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR, 250 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER, 251 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR, 252 buttonbar => $::BUTTONBAR,
… …
248 invr => $::INVR, 278 invr => $::INVR,
249 invr_hb => $::INVR_HB, 279 invr_hb => $::INVR_HB,
250 ); 280 );
251 281
252 while (my ($id, $name) = each %ass) { 282 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name}) 283 $self->widget_associate (undef, $id => $wkw{$name});
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 } 284 }
256} 285}
257 286
258# widget call 287# widget call
259sub ext_w_c { 288sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_; 289 my ($self, $id, $rcb, $method, @args) = @_;
261 290
262 my $w = $self->{widget}{$id} 291 my $w = $self->{widget}{$id}
263 or return; 292 or return;
264 293
265 if ($rid) { 294 if ($rcb) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args)); 295 $rcb->($w->$method (@args));
267 } else { 296 } else {
268 $w->$method (@args); 297 $w->$method (@args);
269 } 298 }
270} 299}
271 300
… …
287 } 316 }
288} 317}
289 318
290# widget get 319# widget get
291sub ext_w_g { 320sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_; 321 my ($self, $id, $rid, @attr) = @_;
293 322
294 my $w = $self->{widget}{$id} 323 my $w = $self->{widget}{$id}
295 or return; 324 or return;
296 325
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 326 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
298} 327}
299 328
300# message window 329# message window
301sub ext_channel_info { 330sub ext_channel_info {
302 my ($self, $info) = @_; 331 my ($self, $info) = @_;
… …
307############################################################################# 336#############################################################################
308 337
309sub logprint { 338sub logprint {
310 my ($self, @a) = @_; 339 my ($self, @a) = @_;
311 340
312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 341 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
313} 342}
314 343
315sub _stat_numdiff { 344sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_; 345 my ($self, $name, $old, $new) = @_;
317 346
… …
401 430
402 if ( 431 if (
403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 432 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
404 ) { 433 ) {
405 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 434 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 435 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
407 } 436 }
408 437
409 $self->update_stats_window ($stats, $prev); 438 $self->update_stats_window ($stats, $prev);
410 439
411 $self->{prev_stats} = { %$stats }; 440 $self->{prev_stats} = { %$stats };
… …
489 $self->{stat_order} = join ",", map $_->[0], @order; 518 $self->{stat_order} = join ",", map $_->[0], @order;
490 519
491 $sktbl->clear; 520 $sktbl->clear;
492 521
493 my $sw = $self->{skillwid}{""} ||= [ 522 my $sw = $self->{skillwid}{""} ||= [
494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 523 0, 0, (new DC::UI::Label text => "Experience", align => 1),
495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 524 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 525 2, 0, (new DC::UI::Label text => "Progress", align => 0),
497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 526 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 527 4, 0, (new DC::UI::Label text => "Experience", align => 1),
499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 528 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 529 6, 0, (new DC::UI::Label text => "Progress", align => 0),
501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 530 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
502 ]; 531 ];
503 532
504 my @add = @$sw; 533 my @add = @$sw;
505 534
506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 535 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
518 if ($ev->{button} == 1) { 547 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name"); 548 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) { 549 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name"); 550 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) { 551 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14; 552 my $shortname = DC::shorten $name, 14;
524 (new CFPlus::UI::Menu 553 (new DC::UI::Menu
525 items => [ 554 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 555 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
527 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 556 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
528 ], 557 ],
529 )->popup ($ev); 558 )->popup ($ev);
530 } else { 559 } else {
531 return 0; 560 return 0;
532 } 561 }
… …
534 1 563 1
535 }; 564 };
536 565
537 my $sw = $self->{skillwid}{$idx} ||= [ 566 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp 567 # exp
539 (new CFPlus::UI::Label 568 (new DC::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 569 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541 570
542 # level 571 # level
543 (new CFPlus::UI::Label 572 (new DC::UI::Label
544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 573 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545 574
546 # progress 575 # progress
547 (new CFPlus::UI::ExperienceProgress), 576 (new DC::UI::ExperienceProgress),
548 577
549 # label 578 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 579 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 580 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ]; 581 ];
553 582
554 push @add, 583 push @add,
555 $x * 4 + 0, $y, $sw->[0], 584 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1], 585 $x * 4 + 1, $y, $sw->[1],
… …
566 595
567 for (@order) { 596 for (@order) {
568 my ($idx, $name) = @$_; 597 my ($idx, $name) = @$_;
569 my $val = $stats->{$idx}; 598 my $val = $stats->{$idx};
570 599
571 next if $prev->{$idx}[1] == $val->[1]; 600 next if $prev->{$idx}[1] eq $val->[1];
572 601
573 my $sw = $self->{skillwid}{$idx}; 602 my $sw = $self->{skillwid}{$idx};
574 $sw->[0]->set_text (::formsep ($val->[1])); 603 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1); 604 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val); 605 $sw->[2]->set_value (@$val);
577 606
578 #$::GAUGES->{sklprg}->set_label ($name); 607 $::GAUGES->{sklprg}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val); 608 $::GAUGES->{sklprg}->set_value (@$val);
580 }
581}
582
583sub macro_send {
584 my ($self, $macro) = @_;
585
586 for my $cmd (@{ $macro->{action} }) {
587 $self->send_command ($cmd);
588 } 609 }
589} 610}
590 611
591sub user_send { 612sub user_send {
592 my ($self, $command) = @_; 613 my ($self, $command) = @_;
… …
594 $self->{record}->($command) 615 $self->{record}->($command)
595 if $self->{record}; 616 if $self->{record};
596 617
597 $self->logprint ("send: ", $command); 618 $self->logprint ("send: ", $command);
598 $self->send_command ($command); 619 $self->send_command ($command);
599 ::status ($command);
600} 620}
601 621
602sub record { 622sub record {
603 my ($self, $cb) = @_; 623 my ($self, $cb) = @_;
604 624
… …
635 } 655 }
636 } 656 }
637 657
638 if ($delay) { 658 if ($delay) {
639 # delay the map drawing a tiny bit in the hope of getting the missing fetched 659 # delay the map drawing a tiny bit in the hope of getting the missing fetched
640 Event->timer (after => 0.03, cb => sub { 660 EV::once undef, 0, 0.03, sub {
641 $_[0]->w->cancel;
642 $self->{map_widget}->update 661 $self->{map_widget}->update
643 if $self->{map_widget}; 662 if $self->{map_widget};
644 }); 663 };
645 } else { 664 } else {
646 $self->{map_widget}->update; 665 $self->{map_widget}->update;
647 } 666 }
648} 667}
649 668
… …
661 680
662 my ($hash, $x, $y, $w, $h) = @$map_info; 681 my ($hash, $x, $y, $w, $h) = @$map_info;
663 682
664 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 683 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
665 $self->{map_cache_new}{$hash} = \$data; 684 $self->{map_cache_new}{$hash} = \$data;
666 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 685 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
667} 686}
668 687
669sub map_clear { 688sub map_clear {
670 my ($self) = @_; 689 my ($self) = @_;
671 690
… …
684 do { 703 do {
685 $tile = pop @{$self->{bg_fetch}} 704 $tile = pop @{$self->{bg_fetch}}
686 or return; 705 or return;
687 } while $self->{texture}[$tile]; 706 } while $self->{texture}[$tile];
688 707
689 CFPlus::DB::get tilecache => $tile, sub { 708 DC::DB::get tilecache => $tile, sub {
690 my ($data) = @_; 709 my ($data) = @_;
691 710
692 return unless $self->{map}; # stop when destroyed 711 return unless $self->{map}; # stop when destroyed
693 712
694 if (defined $data) { 713 if (defined $data) {
… …
722 }; 741 };
723 742
724 if (my $rdata = $self->{map_cache_old}{$hash}) { 743 if (my $rdata = $self->{map_cache_old}{$hash}) {
725 $cb->($$rdata); 744 $cb->($$rdata);
726 } else { 745 } else {
727 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 746 DC::DB::get $self->{mapcache} => $hash, $cb;
728 } 747 }
729} 748}
730 749
731# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 750# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
732# (server resource,s latency, bandwidth), so this hack is warranted. 751# (server resource,s latency, bandwidth), so this hack is warranted.
… …
856 875
857sub face_find { 876sub face_find {
858 my ($self, $facenum, $face, $cb) = @_; 877 my ($self, $facenum, $face, $cb) = @_;
859 878
860 if ($face->{type} == 0) { # FT_FACE 879 if ($face->{type} == 0) { # FT_FACE
861 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 880 my $id = DC::DB::get_tile_id_sync $face->{name};
862 881
863 $face->{id} = $id; 882 $face->{id} = $id;
864 $self->{map}->set_tileid ($facenum => $id); 883 $self->{map}->set_tileid ($facenum => $id);
865 884
866 CFPlus::DB::get tilecache => $id, $cb; 885 DC::DB::get tilecache => $id, $cb;
867 886
868 } elsif ($face->{type} & 1) { # with metadata 887 } elsif ($face->{type} & 1) { # with metadata
869 CFPlus::DB::get res_meta => $face->{name}, $cb; 888 DC::DB::get res_meta => $face->{name}, $cb;
870 889
871 } else { # no metadata 890 } else { # no metadata
872 CFPlus::DB::get res_data => $face->{name}, $cb; 891 DC::DB::get res_data => $face->{name}, $cb;
873 } 892 }
874} 893}
875 894
876sub face_update { 895sub face_update {
877 my ($self, $facenum, $face, $changed) = @_; 896 my ($self, $facenum, $face, $changed) = @_;
878 897
879 if ($face->{type} == 0) { 898 if ($face->{type} == 0) {
880 # image, FT_FACE 899 # image, FT_FACE
881 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 900 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
882 if $changed; 901 if $changed;
883 902
884 $self->have_tile ($face->{id}, delete $face->{data}); 903 $self->have_tile ($face->{id}, delete $face->{data});
885 904
886 } elsif ($face->{type} & 1) { 905 } elsif ($face->{type} & 1) {
887 # split metadata case, FT_MUSIC, FT_SOUND 906 # split metadata case, FT_MUSIC, FT_SOUND
888 if ($changed) { # new data 907 if ($changed) { # new data
889 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 908 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
890 $face->{data} = $meta; 909 $face->{data} = $meta;
891 910
911 # rely on strict ordering here and also on later fetch
892 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 912 DC::DB::put res_data => $face->{name} => $data, sub { };
893 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 913 DC::DB::put res_meta => $face->{name} => $meta, sub { };
894 } 914 }
895 915
896 $face->{data} = $self->{json_coder}->decode ($face->{data}); 916 $face->{data} = $self->{json_coder}->decode ($face->{data});
897
898 ::add_license ($face); 917 ::add_license ($face);
918 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
919 if $changed;
899 920
900 if ($face->{type} == 3) { # FT_MUSIC 921 if ($face->{type} == 3) { # FT_MUSIC
901 ::message ({ markup => "downloaded song #$facenum" })
902 if $changed;
903
904 &::audio_music_push ($facenum); 922 &::audio_music_push ($facenum);
905 } elsif ($face->{type} == 5) { # FT_SOUND 923 } elsif ($face->{type} == 5) { # FT_SOUND
906 ::message ({ markup => "downloaded sound #$facenum" })
907 if $changed;
908
909 &::audio_sound_push ($facenum); 924 &::audio_sound_push ($facenum);
910 } 925 }
911 926
912 } else { 927 } else {
913 # flat resource case, FT_RSRC 928 # flat resource case, FT_RSRC
914 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 929 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
915 if $changed; 930 if $changed;
916 } 931 }
917 932
918 if (my $cbs = $self->{face_cb}{$facenum}) { 933 if (my $cbs = $self->{face_cb}{$facenum}) {
919 $_->($face, $changed) for @$cbs; 934 $_->($face, $changed) for @$cbs;
… …
930 my ($self, $tile, $data) = @_; 945 my ($self, $tile, $data) = @_;
931 946
932 return unless $self->{map}; 947 return unless $self->{map};
933 948
934 my $tex = $self->{texture}[$tile] ||= 949 my $tex = $self->{texture}[$tile] ||=
935 new CFPlus::Texture 950 new DC::Texture
936 tile => $tile, 951 tile => $tile,
937 image => $data, delete_image => 1, 952 image => $data, delete_image => 1,
938 minify => 1, mipmap => 1; 953 minify => 1, mipmap => 1;
939 954
940 if (my $cbs = delete $self->{tile_cb}{$tile}) { 955 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
948 my ($self, $num, $cb) = @_; 963 my ($self, $num, $cb) = @_;
949 964
950 push @{$self->{face_cb}{$num}}, $cb; 965 push @{$self->{face_cb}{$num}}, $cb;
951 966
952 defined wantarray 967 defined wantarray
953 ? CFPlus::guard { 968 ? DC::guard {
954 @{$self->{face_cb}{$num}} 969 @{$self->{face_cb}{$num}}
955 = grep $_ != $cb, 970 = grep $_ != $cb,
956 @{$self->{face_cb}{$num}}; 971 @{$self->{face_cb}{$num}};
957 } 972 }
958 : () 973 : ()
… …
993 1008
994sub sanitise_xml($) { 1009sub sanitise_xml($) {
995 local $_ = shift; 1010 local $_ = shift;
996 1011
997 # we now weed out all tags we do not support 1012 # we now weed out all tags we do not support
998 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1013 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1014 }{
1015 "&lt;"
1016 }gex;
1017
999 # now all entities 1018 # now all entities
1000 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1019 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1001 1020
1002 # handle some elements 1021 # handle some elements
1003 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1022 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1056 1075
1057 ## try to create single paragraphs of multiple lines sent by the server 1076 ## try to create single paragraphs of multiple lines sent by the server
1058 # no longer neecssary with TRT servers 1077 # no longer neecssary with TRT servers
1059 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1078 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1060 1079
1080 for (split /\n/, $text) {
1061 ::message ({ 1081 ::message ({
1062 fg => $fg, 1082 fg => $fg,
1063 markup => $_, 1083 markup => $_,
1064 type => $type, 1084 type => $type,
1065 extra => [@extra], 1085 extra => [@extra],
1066 color_flags => $color 1086 color_flags => $color, #d# ugly, kill
1067 }) for split /\n/, $text; 1087 });
1088
1089 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1090 # actually, this is an ugly design. _we_ should control the channels,
1091 # not some random other widget, as the channels are clearly protocol-specific.
1092 # then we could also react to flags such as CLEAR without resorting to
1093 # hacks such as color_flags, above.
1094 }
1068 1095
1069 $self->{statusbox}->add ($text, 1096 $self->{statusbox}->add ($text,
1070 group => $text, 1097 group => $text,
1071 fg => $fg, 1098 fg => $fg,
1072 timeout => $color >= 2 ? 180 : 10, 1099 timeout => $color >= 2 ? 180 : 10,
1073 tooltip_font => $::FONT_FIXED, 1100 tooltip_font => $::FONT_FIXED,
1074 ); 1101 ) if $type eq "info";
1075 } 1102 }
1076} 1103}
1077 1104
1078sub spell_add { 1105sub spell_add {
1079 my ($self, $spell) = @_; 1106 my ($self, $spell) = @_;
… …
1083 $spell->{message} =~ s/\n+$//; 1110 $spell->{message} =~ s/\n+$//;
1084 $spell->{message} ||= "Server did not provide a description for this spell."; 1111 $spell->{message} ||= "Server did not provide a description for this spell.";
1085 1112
1086 $::SPELL_LIST->add_spell ($spell); 1113 $::SPELL_LIST->add_spell ($spell);
1087 1114
1088 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1115 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1089 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1116 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1090} 1117}
1091 1118
1092sub spell_delete { 1119sub spell_delete {
1093 my ($self, $spell) = @_; 1120 my ($self, $spell) = @_;
1094 1121
… …
1105sub addme_success { 1132sub addme_success {
1106 my ($self) = @_; 1133 my ($self) = @_;
1107 1134
1108 my %skill_help; 1135 my %skill_help;
1109 1136
1110 for my $node (CFPlus::Pod::find skill_description => "*") { 1137 for my $node (DC::Pod::find skill_description => "*") {
1111 my (undef, @par) = CFPlus::Pod::section_of $node; 1138 my (undef, @par) = DC::Pod::section_of $node;
1112 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1139 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1113 }; 1140 };
1114 1141
1115 for my $skill (values %{$self->{skill_info}}) { 1142 for my $skill (values %{$self->{skill_info}}) {
1116 $self->{map_widget}->add_command ("ready_skill $skill", 1143 $self->{map_widget}->add_command ("ready_skill $skill",
1117 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1144 (DC::asxml "Ready the skill '$skill'\n\n")
1118 . $skill_help{$skill}); 1145 . $skill_help{$skill});
1119 $self->{map_widget}->add_command ("use_skill $skill", 1146 $self->{map_widget}->add_command ("use_skill $skill",
1120 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1147 (DC::asxml "Immediately use the skill '$skill'\n\n")
1121 . $skill_help{$skill}); 1148 . $skill_help{$skill});
1122 } 1149 }
1123} 1150}
1124 1151
1125sub eof { 1152sub eof {
… …
1129 1156
1130 ::stop_game (); 1157 ::stop_game ();
1131} 1158}
1132 1159
1133sub update_floorbox { 1160sub update_floorbox {
1134 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1161 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1135 return unless $::CONN; 1162 return unless $::CONN;
1136 1163
1137 $::FLOORBOX->clear; 1164 $::FLOORBOX->clear;
1138 1165
1139 my @add; 1166 my @add;
… …
1141 my $row; 1168 my $row;
1142 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1169 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1143 if ($row < 6) { 1170 if ($row < 6) {
1144 local $_->{face_widget}; # hack to force recreation of widget 1171 local $_->{face_widget}; # hack to force recreation of widget
1145 local $_->{desc_widget}; # hack to force recreation of widget 1172 local $_->{desc_widget}; # hack to force recreation of widget
1146 CFPlus::Item::update_widgets $_; 1173 DC::Item::update_widgets $_;
1147 1174
1148 push @add, 1175 push @add,
1149 0, $row, $_->{face_widget}, 1176 0, $row, $_->{face_widget},
1150 1, $row, $_->{desc_widget}; 1177 1, $row, $_->{desc_widget};
1151 1178
1152 $row++; 1179 $row++;
1153 } else { 1180 } else {
1154 push @add, 1, $row, new CFPlus::UI::Button 1181 push @add, 1, $row, new DC::UI::Button
1155 text => "More...", 1182 text => "More...",
1156 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1183 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1157 ; 1184 ;
1158 last; 1185 last;
1159 } 1186 }
1160 } 1187 }
1161 if ($::CONN->{open_container}) { 1188 if ($::CONN->{open_container}) {
1162 push @add, 1, $row++, new CFPlus::UI::Button 1189 push @add, 1, $row++, new DC::UI::Button
1163 text => "Close container", 1190 text => "Close container",
1164 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1191 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1165 ; 1192 ;
1166 } 1193 }
1167 1194
1168 $::FLOORBOX->add_at (@add); 1195 $::FLOORBOX->add_at (@add);
1169 }); 1196 });
1170 1197
1171 $::WANT_REFRESH->start; 1198 $::WANT_REFRESH = 1;
1172} 1199}
1173 1200
1174sub set_opencont { 1201sub set_opencont {
1175 my ($conn, $tag, $name) = @_; 1202 my ($conn, $tag, $name) = @_;
1176 $conn->{open_container} = $tag; 1203 $conn->{open_container} = $tag;
1177 update_floorbox; 1204 update_floorbox;
1178 1205
1179 $::INVR_HB->clear (); 1206 $::INVR_HB->clear ();
1180 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1207 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1181 1208
1182 if ($tag != 0) { # Floor isn't closable, is it? 1209 if ($tag != 0) { # Floor isn't closable, is it?
1183 $::INVR_HB->add (new CFPlus::UI::Button 1210 $::INVR_HB->add (new DC::UI::Button
1184 text => "Close container", 1211 text => "Close container",
1185 tooltip => "Close the currently open container (if one is open)", 1212 tooltip => "Close the currently open container (if one is open)",
1186 on_activate => sub { 1213 on_activate => sub {
1187 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1214 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1188 if $tag != 0; 1215 if $tag != 0;
… …
1195} 1222}
1196 1223
1197sub update_containers { 1224sub update_containers {
1198 my ($self) = @_; 1225 my ($self) = @_;
1199 1226
1200 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1227 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1201 my $todo = delete $self->{update_container} 1228 my $todo = delete $self->{update_container}
1202 or return; 1229 or return;
1203 1230
1204 for my $tag (keys %$todo) { 1231 for my $tag (keys %$todo) {
1205 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1232 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1242sub item_update { 1269sub item_update {
1243 my ($self, $item) = @_; 1270 my ($self, $item) = @_;
1244 1271
1245 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1272 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1246 1273
1247 CFPlus::Item::update_widgets $item; 1274 DC::Item::update_widgets $item;
1248 1275
1249 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1276 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1250 set_opencont ($::CONN, 0, "Floor"); 1277 set_opencont ($::CONN, 0, "Floor");
1251 1278
1252 } elsif ($item->{flags} & F_OPEN) { 1279 } elsif ($item->{flags} & F_OPEN) {
1253 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1280 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1254 1281
1255 } else { 1282 } else {
1256 $self->{update_container}{$item->{container}}++; 1283 $self->{update_container}{$item->{container}}++;
1257 $self->update_containers; 1284 $self->update_containers;
1258 } 1285 }
… …
1317 0 1344 0
1318 }); 1345 });
1319 1346
1320 $self->update_server_info; 1347 $self->update_server_info;
1321 1348
1322 $self->send_command ("output-sync $::CFG->{output_sync}");
1323 $self->send_command ("output-count $::CFG->{output_count}");
1324 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1349 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1325 $self->send_command ("pickup $::CFG->{pickup}"); 1350 $self->send_command ("pickup $::CFG->{pickup}");
1326} 1351}
1327 1352
1328sub lookat { 1353sub lookat {
… …
1332 $self->send_ext_req (lookat => $x, $y, sub { 1357 $self->send_ext_req (lookat => $x, $y, sub {
1333 my (%msg) = @_; 1358 my (%msg) = @_;
1334 1359
1335 if (exists $msg{npc_dialog}) { 1360 if (exists $msg{npc_dialog}) {
1336 # start npc chat dialog 1361 # start npc chat dialog
1337 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1362 $self->{npc_dialog} = new DC::NPCDialog::
1338 token => $msg{npc_dialog}, 1363 token => $msg{npc_dialog},
1339 title => "$msg{npc_dialog}[0] (NPC)", 1364 title => "$msg{npc_dialog}[0] (NPC)",
1340 conn => $self, 1365 conn => $self,
1341 ; 1366 ;
1342 } 1367 }
… …
1355 $self->SUPER::destroy; 1380 $self->SUPER::destroy;
1356 1381
1357 %$self = (); 1382 %$self = ();
1358} 1383}
1359 1384
1360package CFPlus::NPCDialog; 1385package DC::NPCDialog;
1361 1386
1362our @ISA = 'CFPlus::UI::Toplevel'; 1387our @ISA = 'DC::UI::Toplevel';
1363 1388
1364sub new { 1389sub new {
1365 my $class = shift; 1390 my $class = shift;
1366 1391
1367 my $self = $class->SUPER::new ( 1392 my $self = $class->SUPER::new (
… …
1374 kw => { hi => 0, yes => 0, no => 0 }, 1399 kw => { hi => 0, yes => 0, no => 0 },
1375 has_close_button => 1, 1400 has_close_button => 1,
1376 @_, 1401 @_,
1377 ); 1402 );
1378 1403
1379 CFPlus::weaken (my $this = $self); 1404 DC::weaken (my $this = $self);
1380 1405
1381 $self->connect (delete => sub { $this->destroy; 1 }); 1406 $self->connect (delete => sub { $this->destroy; 1 });
1382 1407
1383 # better use a pane... 1408 # better use a pane...
1384 $self->add (my $hbox = new CFPlus::UI::HBox); 1409 $self->add (my $hbox = new DC::UI::HBox);
1385 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1410 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1386 1411
1387 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1412 $hbox->add (my $vbox = new DC::UI::VBox);
1388 1413
1389 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1414 $vbox->add (new DC::UI::Label text => "Message Entry:");
1390 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1415 $vbox->add ($self->{entry} = new DC::UI::Entry
1391 tooltip => "#npc_message_entry", 1416 tooltip => "#npc_message_entry",
1392 on_activate => sub { 1417 on_activate => sub {
1393 my ($entry, $text) = @_; 1418 my ($entry, $text) = @_;
1394 1419
1395 return unless $text =~ /\S/; 1420 return unless $text =~ /\S/;
… …
1399 1424
1400 0 1425 0
1401 }, 1426 },
1402 ); 1427 );
1403 1428
1404 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1429 $vbox->add ($self->{options} = new DC::UI::VBox);
1405 1430
1406 $self->{bye_button} = new CFPlus::UI::Button 1431 $self->{bye_button} = new DC::UI::Button
1407 text => "Bye (close)", 1432 text => "Bye (close)",
1408 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1433 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1409 on_activate => sub { $this->destroy; 1 }, 1434 on_activate => sub { $this->destroy; 1 },
1410 ; 1435 ;
1411 1436
… …
1430}; 1455};
1431 1456
1432sub update_options { 1457sub update_options {
1433 my ($self) = @_; 1458 my ($self) = @_;
1434 1459
1435 CFPlus::weaken $self; 1460 DC::weaken $self;
1436 1461
1437 $self->{options}->clear; 1462 $self->{options}->clear;
1438 $self->{options}->add ($self->{bye_button}); 1463 $self->{options}->add ($self->{bye_button});
1439 1464
1440 for my $kw (sort keys %{ $self->{kw} }) { 1465 for my $kw (sort keys %{ $self->{kw} }) {
1441 $self->{options}->add (new CFPlus::UI::Button 1466 $self->{options}->add (new DC::UI::Button
1442 text => $kw, 1467 text => $kw,
1443 on_activate => sub { 1468 on_activate => sub {
1444 $self->send ($kw); 1469 $self->send ($kw);
1445 0 1470 0
1446 }, 1471 },
… …
1449} 1474}
1450 1475
1451sub feed { 1476sub feed {
1452 my ($self, $type, @arg) = @_; 1477 my ($self, $type, @arg) = @_;
1453 1478
1454 CFPlus::weaken $self; 1479 DC::weaken $self;
1455 1480
1456 if ($type eq "update") { 1481 if ($type eq "update") {
1457 my (%info) = @arg; 1482 my (%info) = @arg;
1458 1483
1459 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1484 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1460 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1485 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1461 1486
1462 if (exists $info{msg}) { 1487 if (exists $info{msg}) {
1463 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1488 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1464 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1489 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1465 my @link; 1490 my @link;
1466 $text =~ s{ 1491 $text =~ s{
1467 ($match) 1492 ($match)
1468 }{ 1493 }{
1469 my $kw = $1; 1494 my $kw = $1;
1470 1495
1471 push @link, new CFPlus::UI::Label 1496 push @link, new DC::UI::Label
1472 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1497 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1473 can_hover => 1, 1498 can_hover => 1,
1474 can_events => 1, 1499 can_events => 1,
1475 padding_x => 0, 1500 padding_x => 0,
1476 padding_y => 0, 1501 padding_y => 0,
… …
1494} 1519}
1495 1520
1496sub send { 1521sub send {
1497 my ($self, $msg) = @_; 1522 my ($self, $msg) = @_;
1498 1523
1499 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1524 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1500 $self->{textview}->scroll_to_bottom; 1525 $self->{textview}->scroll_to_bottom;
1501 1526
1502 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1527 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1503} 1528}
1504 1529

Diff Legend

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