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.117 by root, Fri Jul 13 05:31:31 2007 UTC vs.
Revision 1.162 by root, Wed Aug 22 21:14:06 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1, 26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 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 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
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 "res-metadata" => $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/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
98 });
99
100 $self->connect_ext (event_capabilities => sub {
101 my ($cap) = @_;
102
103 if (my $ts = $cap->{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]);
108
109 my $w = int $self->{mapw} * 32 / $self->{tilesize};
110 my $h = int $self->{maph} * 32 / $self->{tilesize};
111
112 $self->setup_req (mapsize => "${w}x${h}");
113 }
114 }
115 });
116
117 $self->{json_coder} 53 $self->{json_coder}
118 ->convert_blessed 54 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
120 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
121 }); 57 });
122 58
123 $self->connect_ext (ws_n => sub { 59 # destroy widgets on logout
124 my ($arg) = @_;
125
126 $self->{widgetset}{$arg{id}} = {
127 w => {},
128 };
129 });
130
131 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_;
133
134 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return;
136
137 $_->destroy
138 for values %{$ws->{w}};
139 });
140
141 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_;
143
144 my $args = $arg->{args} || {};
145
146 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub {
148 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
150
151 1
152 };
153 }
154
155 if (my $widget = eval {
156 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new (
158 %$args,
159 s_ws => $arg->{ws},
160 s_id => $arg->{id},
161 )
162 }
163 ) {
164 $self->{widget}{$arg->{id}}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
166 = $widget;
167
168 $widget->connect (on_destroy => sub {
169 my ($widget) = @_;
170
171 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 });
174 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 }
178 });
179
180 $self->connect_ext (w_c => sub {
181 my ($arg) = @_;
182
183 my $w = $self->{widget}{$arg->{id}}
184 or return;
185 my $m = $arg->{name};
186
187 my $a = $arg->{args} || [];
188
189 if (exists $arg->{rid}) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
191 } else {
192 $w->$m (@$a);
193 }
194 });
195
196 $self->connect_ext (w_s => sub {
197 my ($arg) = @_;
198
199 my $w = $self->{widget}{$arg->{id}}
200 or return;
201
202 $w->{$arg->{name}} = $arg->{value};
203 });
204
205 $self->connect_ext (w_g => sub {
206 my ($arg) = @_;
207
208 my $w = $self->{widget}{$arg->{id}}
209 or return;
210
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
212 });
213
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 62 $_->destroy
217 for values %{delete $ws->{w} || {}}; 63 for values %{delete $ws->{w} || {}};
218 } 64 }
… …
239 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
240 86
241 $self 87 $self
242} 88}
243 89
90sub update_fx_want {
91 my ($self) = @_;
92
93 $self->send_exti_msg (fx_want => {
94 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
95 5 => !!$::CFG->{audio_enable}, # FT_SOUND
96 6 => 1, # FT_RSRC
97 });
98}
99
100sub ext_capabilities {
101 my ($self, %cap) = @_;
102
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want;
105
106 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_;
108
109 $self->register_face_handler ($exp_table, sub {
110 my ($face) = @_;
111
112 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
113 $_->() for values %{ $self->{on_exp_update} || {} };
114 });
115
116 ()
117 });
118
119 if (my $ts = $cap{tileset}) {
120 if (my ($default) = grep $_->[2] & 1, @$ts) {
121 $self->{tileset} = $default;
122 $self->{tilesize} = $default->[3];
123 $self->setup_req (tileset => $default->[0]);
124
125 my $w = int $self->{mapw} * 32 / $self->{tilesize};
126 my $h = int $self->{maph} * 32 / $self->{tilesize};
127
128 $self->setup_req (mapsize => "${w}x${h}");
129 }
130 }
131}
132
133sub ext_ambient_music {
134 my ($self, $songs) = @_;
135 &::audio_music_set_ambient ($songs);
136}
137
138#############################################################################
139
140sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_;
142
143 if ($widget) {
144 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget;
146
147 if ($ws) {
148 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 }
151
152 $widget->connect (on_destroy => sub {
153 my ($widget) = @_;
154
155 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws};
158 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166}
167
168# widgetset new
169sub ext_ws_n {
170 my ($self, $id) = @_;
171
172 $self->{widgetset}{$id} = {
173 w => {},
174 };
175}
176
177# widgetset destroy
178sub ext_ws_d {
179 my ($self, $id) = @_;
180
181 my $ws = delete $self->{widgetset}{$id}
182 or return;
183
184 $_->destroy
185 for values %{$ws->{w}};
186}
187
188# widgetset create
189sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_;
191
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 (
203 $ws, $id => scalar eval {
204 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args)
206 }
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
208}
209
210# widgetset associate
211sub ext_ws_a {
212 my ($self, %ass) = @_;
213
214 # everything that has a name, wether conceivably useful or not
215 my %wkw = (
216 root => $CFPlus::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP,
218
219 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR,
223 login_button => $::LOGIN_BUTTON,
224 quit_dialog => $::QUIT_DIALOG,
225 host_entry => $::HOST_ENTRY,
226 metaserver => $::METASERVER,
227 server_info => $::SERVER_INFO,
228
229 setup_dialog => $::SETUP_DIALOG,
230 setup_notebook => $::SETUP_NOTEBOOK,
231 setup_server => $::SETUP_SERVER,
232 setup_keyboard => $::SETUP_KEYBOARD,
233
234 pl_notebook => $::PL_NOTEBOOK,
235 pl_window => $::PL_WINDOW,
236 inventory_page => $::INVENTORY_PAGE,
237 stats_page => $::STATS_PAGE,
238 skill_page => $::SKILL_PAGE,
239 spell_page => $::SPELL_PAGE,
240 spell_list => $::SPELL_LIST,
241
242 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW,
245 statusbox => $::SDTATUSBOX,
246
247 inv => $::INV,
248 invr => $::INVR,
249 invr_hb => $::INVR_HB,
250 );
251
252 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name})
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 }
256}
257
258# widget call
259sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_;
261
262 my $w = $self->{widget}{$id}
263 or return;
264
265 if ($rid) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
267 } else {
268 $w->$method (@args);
269 }
270}
271
272# widget set
273sub ext_w_s {
274 my ($self, $id, $attr) = @_;
275
276 my $w = $self->{widget}{$id}
277 or return;
278
279 for (my $i = 0; $i < $#$attr; $i += 2) {
280 my ($member, $value) = @$attr[$i, $i+1];
281 if (defined $value) {
282 $w->{$member} = $value;
283 } else {
284 delete $w->{$member};
285 }
286 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
287 }
288}
289
290# widget get
291sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_;
293
294 my $w = $self->{widget}{$id}
295 or return;
296
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
298}
299
300# message window
301sub ext_channel_info {
302 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info);
305}
306
307#############################################################################
308
244sub logprint { 309sub logprint {
245 my ($self, @a) = @_; 310 my ($self, @a) = @_;
246 311
247 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
248 my $path = "$Crossfire::VARDIR/log.$self->{host}";
249
250 open my $fh, ">>:utf8", $path
251 or die "Couldn't open logfile $path: $!";
252
253 $fh->autoflush (1);
254
255 $fh;
256 };
257
258 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
259
260 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
261 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
262
263 print {$self->{log_fh}} "$ts ", @a, "\n";
264} 313}
265 314
266sub _stat_numdiff { 315sub _stat_numdiff {
267 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
268 317
… …
401 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
402 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
403 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
404 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
405 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 454 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
455 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
406 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
407 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
408 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
409 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
410 460
… …
428 for keys %RES_TBL; 478 for keys %RES_TBL;
429 479
430 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
431 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
432 482
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 483 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
484 map [$_, $self->{skill_info}{$_}],
485 grep exists $stats->{$_},
486 @skills;
487
488 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
489 $self->{stat_order} = join ",", map $_->[0], @order;
490
434 $sktbl->clear; 491 $sktbl->clear;
435 492
493 my $sw = $self->{skillwid}{""} ||= [
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
502 ];
503
504 my @add = @$sw;
442 505
443 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
444 507
445 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 508 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
446 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 509 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
447 510
448 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
449 for ( 512 for (@order) {
450 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
451 map [$_, $self->{skill_info}{$_}],
452 grep exists $stats->{$_},
453 @skills
454 ) {
455 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
456 514
457 my $spell_cb = sub { 515 my $spell_cb = sub {
458 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
459 517
… …
474 } 532 }
475 533
476 1 534 1
477 }; 535 };
478 536
479 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 537 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp
539 (new CFPlus::UI::Label
480 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
481 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 541
542 # level
543 (new CFPlus::UI::Label
482 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545
546 # progress
547 (new CFPlus::UI::ExperienceProgress),
548
549 # label
483 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
484 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ];
553
554 push @add,
555 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1],
557 $x * 4 + 2, $y, $sw->[2],
558 $x * 4 + 3, $y, $sw->[3],
559 ;
485 560
486 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
487 } 562 }
563
564 $sktbl->add_at (@add);
488 } 565 }
489 566
490 for (grep exists $stats->{$_}, @skills) { 567 for (grep exists $stats->{$_}, @skills) {
568 next if $prev->{$_} == $stats->{$_};
569
570 my $sw = $self->{skillwid}{$_};
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 571 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 572 $sw->[1]->set_text ($stats->{$_}[0] * 1);
573 $sw->[2]->set_value (@{$stats->{$_}});
493 } 574 }
494} 575}
495 576
496sub macro_send { 577sub macro_send {
497 my ($self, $macro) = @_; 578 my ($self, $macro) = @_;
… …
525} 606}
526 607
527sub feed_map1a { 608sub feed_map1a {
528 my ($self, $data) = @_; 609 my ($self, $data) = @_;
529 610
530 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 611 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
612 my $delay;
613
614 for my $tile (@$missing) {
615 next if $self->{delay}{$tile};
616
617 $delay = 1;
618
619 if (my $tex = $::CONN->{texture}[$tile]) {
620 $tex->upload;
621 } else {
622 $self->{delay}{$tile} = 1;
623
624 # we assume the face is in-flight and will eventually come
625 push @{$self->{tile_cb}{$tile}}, sub {
626 delete $self->{delay}{$tile};
627 $_[0]->upload;
628 };
629 }
630 }
631
632 if ($delay) {
633 # delay the map drawing a tiny bit in the hope of getting the missing fetched
634 Event->timer (after => 0.03, cb => sub {
635 $_[0]->w->cancel;
636 $self->{map_widget}->update
637 if $self->{map_widget};
638 });
639 } else {
531 $self->{map_widget}->update; 640 $self->{map_widget}->update;
641 }
532} 642}
533 643
534sub magicmap { 644sub magicmap {
535 my ($self, $w, $h, $x, $y, $data) = @_; 645 my ($self, $w, $h, $x, $y, $data) = @_;
536 646
… …
543 my $map_info = delete $self->{map_info} 653 my $map_info = delete $self->{map_info}
544 or return; 654 or return;
545 655
546 my ($hash, $x, $y, $w, $h) = @$map_info; 656 my ($hash, $x, $y, $w, $h) = @$map_info;
547 657
548 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 658 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
659 $self->{map_cache_new}{$hash} = \$data;
549 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 660 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
550 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
551} 661}
552 662
553sub map_clear { 663sub map_clear {
554 my ($self) = @_; 664 my ($self) = @_;
555 665
… …
561} 671}
562 672
563sub bg_fetch { 673sub bg_fetch {
564 my ($self) = @_; 674 my ($self) = @_;
565 675
566 my $id; 676 my $tile;
567 677
568 do { 678 do {
569 $id = pop @{$self->{bg_fetch}} 679 $tile = pop @{$self->{bg_fetch}}
570 or return; 680 or return;
571 } while $self->{texture}[$id]; 681 } while $self->{texture}[$tile];
572 682
573 CFPlus::DB::get tilecache => $id, sub { 683 CFPlus::DB::get tilecache => $tile, sub {
574 my ($data) = @_; 684 my ($data) = @_;
575 685
576 return unless $self->{map}; # stop when destroyed 686 return unless $self->{map}; # stop when destroyed
577 687
578 $self->set_texture ($id => $data)
579 if defined $data; 688 if (defined $data) {
689 $self->have_tile ($tile, $data);
690 $self->{texture}[$tile]->upload;
691 }
580 692
581 $self->bg_fetch; 693 $self->bg_fetch;
582 }; 694 };
583} 695}
584 696
585sub load_map($$$) { 697sub load_map($$$) {
586 my ($self, $hash, $x, $y) = @_; 698 my ($self, $hash, $x, $y) = @_;
587 699
588 my $gen = $self->{map_change_gen}; 700 my $gen = $self->{map_change_gen};
589 701
590 CFPlus::DB::get $self->{mapcache} => $hash, sub { 702 my $cb = sub {
591 return unless $gen == $self->{map_change_gen}; 703 return unless $gen == $self->{map_change_gen};
592 704
593 my ($data) = @_; 705 my ($data) = @_;
594 706
595 if (defined $data) { 707 if (defined $data) {
708 $self->{map_cache_new}{$hash} = \$data;
709
596 $data = Compress::LZF::decompress $data; 710 my $data = Compress::LZF::decompress $data;
597 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
598 711
599 my $inprogress = @{ $self->{bg_fetch} || [] }; 712 my $inprogress = @{ $self->{bg_fetch} || [] };
600 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 713 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
601 $self->bg_fetch unless $inprogress; 714 $self->bg_fetch unless $inprogress;
602 } 715 }
603 }; 716 };
717
718 if (my $rdata = $self->{map_cache_old}{$hash}) {
719 $cb->($$rdata);
720 } else {
721 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
722 }
604} 723}
605 724
606# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 725# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
607# (server resource,s latency, bandwidth), so this hack is warranted. 726# (server resource,s latency, bandwidth), so this hack is warranted.
608# the right fix is to make real tiled maps with an overview file 727# the right fix is to make real tiled maps with an overview file
… …
701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 820 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
702 821
703 $self->flush_map; 822 $self->flush_map;
704 823
705 ++$self->{map_change_gen}; 824 ++$self->{map_change_gen};
825 $self->{map_cache_old} = delete $self->{map_cache_new};
706 826
707 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 827 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
708 828
709 my $mapmapw = $self->{mapmap}->{w}; 829 my $mapmapw = $self->{mapmap}->{w};
710 my $mapmaph = $self->{mapmap}->{h}; 830 my $mapmaph = $self->{mapmap}->{h};
… …
729} 849}
730 850
731sub face_find { 851sub face_find {
732 my ($self, $facenum, $face, $cb) = @_; 852 my ($self, $facenum, $face, $cb) = @_;
733 853
734 my $hash = "$face->{chksum},$face->{name}"; 854 if ($face->{type} == 0) { # FT_FACE
735
736 my $id = CFPlus::DB::get_tile_id_sync $hash; 855 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
737 856
738 $face->{id} = $id; 857 $face->{id} = $id;
739 $self->{faceid}[$facenum] = $id;
740
741 $self->{map}->set_tileid ($facenum => $id); 858 $self->{map}->set_tileid ($facenum => $id);
742 859
743 CFPlus::DB::get tilecache => $id, $cb; 860 CFPlus::DB::get tilecache => $id, $cb;
861
862 } elsif ($face->{type} & 1) { # with metadata
863 CFPlus::DB::get res_meta => $face->{name}, $cb;
864
865 } else { # no metadata
866 CFPlus::DB::get res_data => $face->{name}, $cb;
867 }
744} 868}
745 869
746sub face_update { 870sub face_update {
747 my ($self, $facenum, $face, $changed) = @_; 871 my ($self, $facenum, $face, $changed) = @_;
748 872
873 if ($face->{type} == 0) {
874 # image, FT_FACE
749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 875 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
750 if $changed; 876 if $changed;
751 877
752 $self->set_texture ($face->{id} => delete $face->{image}); 878 $self->have_tile ($face->{id}, delete $face->{data});
879
880 } elsif ($face->{type} & 1) {
881 # split metadata case, FT_MUSIC, FT_SOUND
882 if ($changed) { # new data
883 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
884 $face->{data} = $meta;
885
886 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
887 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
888 }
889
890 $face->{data} = $self->{json_coder}->decode ($face->{data});
891
892 ::add_license ($face);
893
894 if ($face->{type} == 3) { # FT_MUSIC
895 ::message ({ markup => "downloaded song #$facenum" })
896 if $changed;
897
898 &::audio_music_push ($facenum);
899 } elsif ($face->{type} == 5) { # FT_SOUND
900 ::message ({ markup => "downloaded sound #$facenum" })
901 if $changed;
902
903 &::audio_sound_push ($facenum);
904 }
905
906 } else {
907 # flat resource case, FT_RSRC
908 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
909 if $changed;
910 }
911
912 if (my $cbs = $self->{face_cb}{$facenum}) {
913 $_->($face, $changed) for @$cbs;
914 }
753} 915}
754 916
755sub smooth_update { 917sub smooth_update {
756 my ($self, $facenum, $face) = @_; 918 my ($self, $facenum, $face) = @_;
757 919
758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 920 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
759} 921}
760 922
761sub set_texture { 923sub have_tile {
762 my ($self, $id, $data) = @_; 924 my ($self, $tile, $data) = @_;
763 925
764 $self->{texture}[$id] = my $tex = 926 return unless $self->{map};
927
928 my $tex = $self->{texture}[$tile] ||=
765 new_from_image CFPlus::Texture 929 new CFPlus::Texture
930 tile => $tile,
931 image => $data, delete_image => 1,
766 $data, minify => 1, mipmap => 1; 932 minify => 1, mipmap => 1;
767 933
768 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 934 if (my $cbs = delete $self->{tile_cb}{$tile}) {
769 $self->{map_widget}->update; 935 $_->($tex) for @$cbs;
936 }
937}
938
939# call in non-void context registers a temporary
940# hook with handle, otherwise its permanent
941sub on_face_change {
942 my ($self, $num, $cb) = @_;
943
944 push @{$self->{face_cb}{$num}}, $cb;
945
946 defined wantarray
947 ? CFPlus::guard {
948 @{$self->{face_cb}{$num}}
949 = grep $_ != $cb,
950 @{$self->{face_cb}{$num}};
951 }
952 : ()
953}
954
955# call in non-void context registers a temporary
956# hook with handle, otherwise its permanent
957sub register_face_handler {
958 my ($self, $num, $cb) = @_;
959
960 return unless $num;
961
962 # invoke if available right now
963 $cb->($self->{face}[$num], 0)
964 unless exists $self->{face}[$num]{loading};
965
966 # future changes
967 $self->on_face_change ($num => $cb)
770} 968}
771 969
772sub sound_play { 970sub sound_play {
773 my ($self, $x, $y, $soundnum, $type) = @_; 971 my ($self, $type, $face, $dx, $dy, $vol) = @_;
774 972
775 $self->{sound_play}->($x, $y, $soundnum, $type); 973 &::audio_sound_play ($face, $dx, $dy, $vol)
974 unless $type & 1; # odd types are silent for future expansion
776} 975}
777 976
778my $LAST_QUERY; # server is stupid, stupid, stupid 977my $LAST_QUERY; # server is stupid, stupid, stupid
779 978
780sub query { 979sub query {
… …
845 $self->{$type} = $text; 1044 $self->{$type} = $text;
846 } else { 1045 } else {
847 $self->logprint ("msg: ", $text); 1046 $self->logprint ("msg: ", $text);
848 return if $color < 0; # negative color == ignore if not understood 1047 return if $color < 0; # negative color == ignore if not understood
849 1048
850 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1049 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
851 1050
852 ## try to create single paragraphs of multiple lines sent by the server 1051 ## try to create single paragraphs of multiple lines sent by the server
853 # no longer neecssary with TRT servers 1052 # no longer neecssary with TRT servers
854 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1053 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
855 1054
856 ::message ({ fg => $fg, markup => $_ }) 1055 ::message ({
1056 fg => $fg,
1057 markup => $_,
1058 type => $type,
1059 extra => [@extra],
1060 color_flags => $color
857 for split /\n/, $text; 1061 }) for split /\n/, $text;
858 1062
859 $self->{statusbox}->add ($text, 1063 $self->{statusbox}->add ($text,
860 group => $text, 1064 group => $text,
861 fg => $fg, 1065 fg => $fg,
862 timeout => $color >= 2 ? 180 : 10, 1066 timeout => $color >= 2 ? 180 : 10,
… …
918 $self->{map_widget}->clr_commands; 1122 $self->{map_widget}->clr_commands;
919 1123
920 ::stop_game (); 1124 ::stop_game ();
921} 1125}
922 1126
923sub image_info {
924 my ($self, $numfaces) = @_;
925
926 $self->{num_faces} = $numfaces;
927 $self->{face_prefetch} = [1 .. $numfaces];
928 $self->face_prefetch;
929}
930
931sub face_prefetch {
932 my ($self) = @_;
933
934 return unless $::CFG->{face_prefetch};
935
936 if ($self->{num_faces}) {
937 return if @{ $self->{send_queue} || [] };
938 my $todo = @{ $self->{face_prefetch} }
939 or return;
940
941 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
942
943 $self->send ("requestinfo image_sums $face $face");
944
945 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
946 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
947 } elsif (!exists $self->{num_faces}) {
948 $self->send ("requestinfo image_info");
949
950 $self->{num_faces} = 0;
951
952 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
953 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
954 }
955}
956
957sub update_floorbox { 1127sub update_floorbox {
958 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1128 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
959 return unless $::CONN; 1129 return unless $::CONN;
960 1130
961 $::FLOORBOX->clear; 1131 $::FLOORBOX->clear;
1132
1133 my @add;
962 1134
963 my $row; 1135 my $row;
964 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1136 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
965 if ($row < 6) { 1137 if ($row < 6) {
966 local $_->{face_widget}; # hack to force recreation of widget 1138 local $_->{face_widget}; # hack to force recreation of widget
967 local $_->{desc_widget}; # hack to force recreation of widget 1139 local $_->{desc_widget}; # hack to force recreation of widget
968 CFPlus::Item::update_widgets $_; 1140 CFPlus::Item::update_widgets $_;
969 1141
1142 push @add,
970 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1143 0, $row, $_->{face_widget},
971 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1144 1, $row, $_->{desc_widget};
972 1145
973 $row++; 1146 $row++;
974 } else { 1147 } else {
975 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1148 push @add, 1, $row, new CFPlus::UI::Button
976 text => "More...", 1149 text => "More...",
977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1150 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
978 ); 1151 ;
979 last; 1152 last;
980 } 1153 }
981 } 1154 }
982 if ($::CONN->{open_container}) { 1155 if ($::CONN->{open_container}) {
983 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1156 push @add, 1, $row++, new CFPlus::UI::Button
984 text => "Close container", 1157 text => "Close container",
985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1158 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
986 ); 1159 ;
987 } 1160 }
1161
1162 $::FLOORBOX->add_at (@add);
988 }); 1163 });
989 1164
990 $::WANT_REFRESH++; 1165 $::WANT_REFRESH->start;
991} 1166}
992 1167
993sub set_opencont { 1168sub set_opencont {
994 my ($conn, $tag, $name) = @_; 1169 my ($conn, $tag, $name) = @_;
995 $conn->{open_container} = $tag; 1170 $conn->{open_container} = $tag;
996 update_floorbox; 1171 update_floorbox;
997 1172
998 $::INV_RIGHT_HB->clear (); 1173 $::INVR_HB->clear ();
999 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1174 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1000 1175
1001 if ($tag != 0) { # Floor isn't closable, is it? 1176 if ($tag != 0) { # Floor isn't closable, is it?
1002 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1177 $::INVR_HB->add (new CFPlus::UI::Button
1003 text => "Close container", 1178 text => "Close container",
1004 tooltip => "Close the currently open container (if one is open)", 1179 tooltip => "Close the currently open container (if one is open)",
1005 on_activate => sub { 1180 on_activate => sub {
1006 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1181 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1007 if $tag != 0; 1182 if $tag != 0;
1008 #if $CONN->{open_container} != 0;
1009 0 1183 0
1010 }, 1184 },
1011 ); 1185 );
1012 } 1186 }
1013 1187
… …
1112 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1286 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1113 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1287 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1114 . "map size $self->{mapw}×$self->{maph}\n" 1288 . "map size $self->{mapw}×$self->{maph}\n"
1115 ); 1289 );
1116 1290
1117 ::setup_build_button ($self->{editor_support}->{builder_ui});
1118} 1291}
1119 1292
1120sub logged_in { 1293sub logged_in {
1121 my ($self) = @_; 1294 my ($self) = @_;
1122 1295
1123 $self->send_ext_req (cfplus_support => version => 1, sub { 1296 $self->send_ext_req (cfplus_support => version => 2, sub {
1297 my (%msg) = @_;
1298
1124 $self->{cfplus_ext} = $_[0]{version}; 1299 $self->{cfplus_ext} = $msg{version};
1125 $self->update_server_info; 1300 $self->update_server_info;
1126 1301
1127 if ($self->{cfplus_ext} >= 2) { 1302 if ($self->{cfplus_ext} >= 2) {
1128 $self->send_ext_req ("editor_support", sub { 1303 $self->send_ext_req ("editor_support", sub {
1129 $self->{editor_support} = $_[0]; 1304 $self->{editor_support} = { @_ };
1130 $self->update_server_info; 1305 $self->update_server_info;
1131 1306
1132 0 1307 0
1133 }); 1308 });
1134 } 1309 }
… …
1142 $self->send_command ("output-count $::CFG->{output_count}"); 1317 $self->send_command ("output-count $::CFG->{output_count}");
1143 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1318 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1144 $self->send_command ("pickup $::CFG->{pickup}"); 1319 $self->send_command ("pickup $::CFG->{pickup}");
1145} 1320}
1146 1321
1147sub buildat {
1148 my ($self, $builditem, $x, $y) = @_;
1149
1150 if ($self->{cfplus_ext}) {
1151 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1152 }
1153}
1154
1155sub lookat { 1322sub lookat {
1156 my ($self, $x, $y) = @_; 1323 my ($self, $x, $y) = @_;
1157 1324
1158 if ($self->{cfplus_ext}) { 1325 if ($self->{cfplus_ext}) {
1159 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1326 $self->send_ext_req (lookat => $x, $y, sub {
1160 my ($msg) = @_; 1327 my (%msg) = @_;
1161 1328
1162 if (exists $msg->{npc_dialog}) { 1329 if (exists $msg{npc_dialog}) {
1163 # start npc chat dialog 1330 # start npc chat dialog
1164 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1331 $self->{npc_dialog} = new CFPlus::NPCDialog::
1165 dx => $x, 1332 token => $msg{npc_dialog},
1166 dy => $y,
1167 title => "$msg->{npc_dialog} (NPC)", 1333 title => "$msg{npc_dialog}[0] (NPC)",
1168 conn => $self, 1334 conn => $self,
1169 ; 1335 ;
1170 } 1336 }
1171 }); 1337 });
1172 } 1338 }
… …
1237 on_activate => sub { $this->destroy; 1 }, 1403 on_activate => sub { $this->destroy; 1 },
1238 ; 1404 ;
1239 1405
1240 $self->update_options; 1406 $self->update_options;
1241 1407
1242 $self->{id} = $self->{conn}->send_ext_req ( 1408 $self->{id} = "npc-channel-" . $self->{conn}->token;
1243 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1409 $self->{conn}->connect_ext ($self->{id} => sub {
1244 sub { $this && $this->feed (@_) } 1410 $this->feed (@_) if $this;
1245 ); 1411 });
1412
1413 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1246 1414
1247 $self->{entry}->grab_focus; 1415 $self->{entry}->grab_focus;
1248 1416
1249 $self->{textview}->add_paragraph ({ 1417 $self->{textview}->add_paragraph ({
1250 fg => [1, 1, 0, 1], 1418 fg => [1, 1, 0, 1],
… …
1273 ); 1441 );
1274 } 1442 }
1275} 1443}
1276 1444
1277sub feed { 1445sub feed {
1278 my ($self, $msg) = @_; 1446 my ($self, $type, @arg) = @_;
1279 1447
1280 CFPlus::weaken $self; 1448 CFPlus::weaken $self;
1281 1449
1282 if ($msg->{msgtype} eq "reply") { 1450 if ($type eq "update") {
1451 my (%info) = @arg;
1452
1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1453 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1454 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1285
1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1288 my @link;
1289 $text =~ s{
1290 ($match)
1291 }{
1292 my $kw = $1;
1293
1294 push @link, new CFPlus::UI::Label
1295 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1296 can_hover => 1,
1297 can_events => 1,
1298 padding_x => 0,
1299 padding_y => 0,
1300 on_button_up => sub {
1301 $self->send ($kw);
1302 };
1303
1304 "\x{fffc}"
1305 }giex;
1306 1455
1456 if (exists $info{msg}) {
1457 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1458 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1459 my @link;
1460 $text =~ s{
1461 ($match)
1462 }{
1463 my $kw = $1;
1464
1465 push @link, new CFPlus::UI::Label
1466 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1467 can_hover => 1,
1468 can_events => 1,
1469 padding_x => 0,
1470 padding_y => 0,
1471 on_button_up => sub {
1472 $self->send ($kw);
1473 };
1474
1475 "\x{fffc}"
1476 }giex;
1477
1307 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1478 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1308 $self->{textview}->scroll_to_bottom; 1479 $self->{textview}->scroll_to_bottom;
1480 }
1481
1309 $self->update_options; 1482 $self->update_options;
1310 } else { 1483 } else {
1311 $self->destroy; 1484 $self->destroy;
1312 } 1485 }
1313 1486
… …
1318 my ($self, $msg) = @_; 1491 my ($self, $msg) = @_;
1319 1492
1320 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1493 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1321 $self->{textview}->scroll_to_bottom; 1494 $self->{textview}->scroll_to_bottom;
1322 1495
1323 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1496 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1324} 1497}
1325 1498
1326sub destroy { 1499sub destroy {
1327 my ($self) = @_; 1500 my ($self) = @_;
1328 1501
1329 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1502 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1330 1503
1331 if ($self->{conn}) { 1504 if ($self->{conn}) {
1332 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1505 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1333 delete $self->{conn}{npc_dialog}; 1506 delete $self->{conn}{npc_dialog};
1334 $self->{conn}->disconnect_ext ($self->{id}); 1507 $self->{conn}->disconnect_ext ($self->{id});
1335 } 1508 }
1336 1509
1337 $self->SUPER::destroy; 1510 $self->SUPER::destroy;

Diff Legend

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