… | |
… | |
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 | xwidget => 1, |
26 | ywidget => 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 (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
53 | $self->connect_ext (event_capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
54 | my ($cap) = @_; |
59 | my (%cap) = @_; |
55 | |
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | $self->update_fx_want; |
|
|
63 | |
56 | if (my $ts = $cap->{tileset}) { |
64 | if (my $ts = $cap{tileset}) { |
57 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
65 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
58 | $self->{tileset} = $default; |
66 | $self->{tileset} = $default; |
59 | $self->{tilesize} = $default->[3]; |
67 | $self->{tilesize} = $default->[3]; |
60 | $self->setup_req (tileset => $default->[0]); |
68 | $self->setup_req (tileset => $default->[0]); |
61 | |
69 | |
… | |
… | |
65 | $self->setup_req (mapsize => "${w}x${h}"); |
73 | $self->setup_req (mapsize => "${w}x${h}"); |
66 | } |
74 | } |
67 | } |
75 | } |
68 | }); |
76 | }); |
69 | |
77 | |
|
|
78 | $self->{json_coder} |
|
|
79 | ->convert_blessed |
|
|
80 | ->filter_json_single_key_object (__w_ => sub { |
|
|
81 | $self->{widget}{$_[0]} |
|
|
82 | }); |
|
|
83 | |
|
|
84 | # widgetset new |
70 | $self->connect_ext (ws_n => sub { |
85 | $self->connect_ext (ws_n => sub { |
71 | my ($arg) = @_; |
86 | my ($id) = @_; |
72 | |
87 | |
73 | $self->{widgetset}{$arg{id}} = { |
88 | $self->{widgetset}{$id} = { |
74 | w => {}, |
89 | w => {}, |
75 | }; |
90 | }; |
76 | }); |
91 | }); |
77 | |
92 | |
|
|
93 | # widgetset destroy |
78 | $self->connect_ext (ws_d => sub { |
94 | $self->connect_ext (ws_d => sub { |
79 | my ($arg) = @_; |
95 | my ($id) = @_; |
80 | |
96 | |
81 | my $ws = delete $self->{widgetset}{$arg{id}} |
97 | my $ws = delete $self->{widgetset}{$id} |
82 | or return; |
98 | or return; |
83 | |
99 | |
84 | $_->destroy |
100 | $_->destroy |
85 | for values %{$ws->{w}}; |
101 | for values %{$ws->{w}}; |
86 | }); |
102 | }); |
87 | |
103 | |
|
|
104 | # widgetset create |
88 | $self->connect_ext (ws_c => sub { |
105 | $self->connect_ext (ws_c => sub { |
89 | my ($arg) = @_; |
106 | my ($ws, $id, $class, $args) = @_; |
90 | |
|
|
91 | my $args = $arg->{args} || {}; |
|
|
92 | |
107 | |
93 | for my $ev (grep /^on_/, keys %$args) { |
108 | for my $ev (grep /^on_/, keys %$args) { |
94 | $args->{$ev} = sub { |
109 | $args->{$ev} = sub { |
95 | my $id = shift->{s_id}; |
110 | my $id = shift->{s_id}; |
96 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
111 | $self->send_exti_msg (w_e => $id, $ev, \@_); |
97 | |
112 | |
98 | 1 |
113 | 1 |
99 | }; |
114 | }; |
100 | } |
115 | } |
101 | |
116 | |
102 | if (my $widget = eval { |
117 | if (my $widget = eval { |
|
|
118 | local $SIG{__DIE__}; |
103 | "CFPlus::UI::$arg->{class}"->new ( |
119 | "CFPlus::UI::$class"->new ( |
104 | %$args, |
120 | %$args, |
105 | s_ws => $arg->{ws}, |
121 | s_ws => $ws, |
106 | s_id => $arg->{id}, |
122 | s_id => $id, |
107 | ) |
123 | ) |
108 | } |
124 | } |
109 | ) { |
125 | ) { |
110 | $self->{widget}{$arg->{id}} |
126 | $self->{widget}{$id} |
111 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
127 | = $self->{widgetset}{$ws}{w}{$id} |
112 | = $widget; |
128 | = $widget; |
113 | |
129 | |
114 | $widget->connect (on_destroy => sub { |
130 | $widget->connect (on_destroy => sub { |
115 | my ($widget) = @_; |
131 | my ($widget) = @_; |
116 | |
132 | |
117 | delete $self->{widget}{$widget->{s_id}}; |
133 | delete $self->{widget}{$widget->{s_id}}; |
118 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
134 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
119 | }); |
135 | }); |
120 | } else { |
136 | } else { |
121 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
137 | warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
122 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
138 | $self->send_exti_msg (w_e => $id, "destroy"); |
123 | } |
139 | } |
124 | }); |
140 | }); |
125 | |
141 | |
|
|
142 | # widget call |
126 | $self->connect_ext (w_c => sub { |
143 | $self->connect_ext (w_c => sub { |
127 | my ($arg) = @_; |
144 | my ($id, $rid, $method, $args) = @_; |
128 | |
145 | |
129 | my $w = $self->{widget}{$arg->{id}} |
146 | my $w = $self->{widget}{$id} |
130 | or return; |
147 | or return; |
131 | my $m = $arg->{name}; |
|
|
132 | |
148 | |
133 | my @a = map { |
149 | $args ||= []; |
134 | "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__} |
|
|
135 | ? $self->{widget}{$_->{__widget_ref__}} |
|
|
136 | : $_ |
|
|
137 | } @{ $arg->{args} || [] }; |
|
|
138 | |
150 | |
139 | if (exists $arg->{rid}) { |
151 | if ($rid) { |
140 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); |
152 | $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); |
141 | } else { |
153 | } else { |
142 | $w->$m (@a); |
154 | $w->$method (@$args); |
143 | } |
155 | } |
144 | }); |
156 | }); |
145 | |
157 | |
|
|
158 | # widget set |
146 | $self->connect_ext (w_s => sub { |
159 | $self->connect_ext (w_s => sub { |
147 | my ($arg) = @_; |
160 | my ($id, $attr) = @_; |
148 | |
161 | |
149 | my $w = $self->{widget}{$arg->{id}} |
162 | my $w = $self->{widget}{$id} |
150 | or return; |
163 | or return; |
151 | |
164 | |
152 | $w->{$arg->{name}} = $arg->{value}; |
165 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
166 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
167 | if (defined $value) { |
|
|
168 | $w->{$member} = $value; |
|
|
169 | } else { |
|
|
170 | delete $w->{$member}; |
|
|
171 | } |
|
|
172 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
173 | } |
153 | }); |
174 | }); |
154 | |
175 | |
|
|
176 | # widget get |
155 | $self->connect_ext (w_g => sub { |
177 | $self->connect_ext (w_g => sub { |
156 | my ($arg) = @_; |
178 | my ($id, $rid, $attr) = @_; |
157 | |
179 | |
158 | my $w = $self->{widget}{$arg->{id}} |
180 | my $w = $self->{widget}{$id} |
159 | or return; |
181 | or return; |
160 | |
182 | |
161 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
183 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
162 | }); |
184 | }); |
163 | |
185 | |
|
|
186 | # message window |
|
|
187 | $self->connect_ext (channel_info => sub { |
|
|
188 | my ($info) = @_; |
|
|
189 | $self->{channels}->{$info->{id}} = $info; |
|
|
190 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
191 | }); |
|
|
192 | |
|
|
193 | # destroy widgets on logout |
164 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
194 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
165 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
195 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
166 | $_->destroy |
196 | $_->destroy |
167 | for values %{delete $ws->{w} || {}}; |
197 | for values %{delete $ws->{w} || {}}; |
168 | } |
198 | } |
… | |
… | |
189 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
219 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
190 | |
220 | |
191 | $self |
221 | $self |
192 | } |
222 | } |
193 | |
223 | |
|
|
224 | sub update_fx_want { |
|
|
225 | my ($self) = @_; |
|
|
226 | |
|
|
227 | $self->send_exti_msg (fx_want => { |
|
|
228 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
229 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
230 | }); |
|
|
231 | } |
|
|
232 | |
194 | sub logprint { |
233 | sub logprint { |
195 | my ($self, @a) = @_; |
234 | my ($self, @a) = @_; |
196 | |
235 | |
197 | $self->{log_fh} ||= do { |
236 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
198 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
199 | |
|
|
200 | open my $fh, ">>:utf8", $path |
|
|
201 | or die "Couldn't open logfile $path: $!"; |
|
|
202 | |
|
|
203 | $fh->autoflush (1); |
|
|
204 | |
|
|
205 | $fh; |
|
|
206 | }; |
|
|
207 | |
|
|
208 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
209 | |
|
|
210 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
211 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
212 | |
|
|
213 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
214 | } |
237 | } |
215 | |
238 | |
216 | sub _stat_numdiff { |
239 | sub _stat_numdiff { |
217 | my ($self, $name, $old, $new) = @_; |
240 | my ($self, $name, $old, $new) = @_; |
218 | |
241 | |
… | |
… | |
381 | my @skills = keys %{ $self->{skill_info} }; |
404 | my @skills = keys %{ $self->{skill_info} }; |
382 | |
405 | |
383 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
406 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
384 | $sktbl->clear; |
407 | $sktbl->clear; |
385 | |
408 | |
|
|
409 | my @add; |
|
|
410 | |
|
|
411 | push @add, |
386 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
412 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
387 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
413 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
388 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
414 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
389 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
415 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
390 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
416 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
391 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
417 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
418 | ; |
392 | |
419 | |
393 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
420 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
394 | |
421 | |
395 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
422 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
396 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
423 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
… | |
… | |
424 | } |
451 | } |
425 | |
452 | |
426 | 1 |
453 | 1 |
427 | }; |
454 | }; |
428 | |
455 | |
|
|
456 | push @add, |
429 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
457 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
430 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
458 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
431 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
459 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
432 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
460 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
433 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
461 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
434 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
462 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
463 | ; |
435 | |
464 | |
436 | $x++ and ($x, $y) = (0, $y + 1); |
465 | $x++ and ($x, $y) = (0, $y + 1); |
437 | } |
466 | } |
|
|
467 | |
|
|
468 | $sktbl->add_at (@add); |
438 | } |
469 | } |
439 | |
470 | |
440 | for (grep exists $stats->{$_}, @skills) { |
471 | for (grep exists $stats->{$_}, @skills) { |
441 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
472 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
442 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
473 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
… | |
… | |
475 | } |
506 | } |
476 | |
507 | |
477 | sub feed_map1a { |
508 | sub feed_map1a { |
478 | my ($self, $data) = @_; |
509 | my ($self, $data) = @_; |
479 | |
510 | |
480 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
511 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
512 | my $delay; |
|
|
513 | |
|
|
514 | for my $tile (@$missing) { |
|
|
515 | next if $self->{delay}{$tile}; |
|
|
516 | |
|
|
517 | $delay = 1; |
|
|
518 | |
|
|
519 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
520 | $tex->upload; |
|
|
521 | } else { |
|
|
522 | $self->{delay}{$tile} = 1; |
|
|
523 | |
|
|
524 | # we assume the face is in-flight and will eventually come |
|
|
525 | push @{$self->{face_cb}{$tile}}, sub { |
|
|
526 | delete $self->{delay}{$tile}; |
|
|
527 | $_[0]->upload; |
|
|
528 | }; |
|
|
529 | } |
|
|
530 | } |
|
|
531 | |
|
|
532 | if ($delay) { |
|
|
533 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
534 | Event->timer (after => 0.03, cb => sub { |
|
|
535 | $_[0]->w->cancel; |
|
|
536 | $self->{map_widget}->update; |
|
|
537 | }); |
|
|
538 | } else { |
481 | $self->{map_widget}->update; |
539 | $self->{map_widget}->update; |
|
|
540 | } |
482 | } |
541 | } |
483 | |
542 | |
484 | sub magicmap { |
543 | sub magicmap { |
485 | my ($self, $w, $h, $x, $y, $data) = @_; |
544 | my ($self, $w, $h, $x, $y, $data) = @_; |
486 | |
545 | |
… | |
… | |
493 | my $map_info = delete $self->{map_info} |
552 | my $map_info = delete $self->{map_info} |
494 | or return; |
553 | or return; |
495 | |
554 | |
496 | my ($hash, $x, $y, $w, $h) = @$map_info; |
555 | my ($hash, $x, $y, $w, $h) = @$map_info; |
497 | |
556 | |
498 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
557 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
558 | $self->{map_cache_new}{$hash} = \$data; |
499 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
559 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
500 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
|
|
501 | } |
560 | } |
502 | |
561 | |
503 | sub map_clear { |
562 | sub map_clear { |
504 | my ($self) = @_; |
563 | my ($self) = @_; |
505 | |
564 | |
… | |
… | |
518 | do { |
577 | do { |
519 | $id = pop @{$self->{bg_fetch}} |
578 | $id = pop @{$self->{bg_fetch}} |
520 | or return; |
579 | or return; |
521 | } while $self->{texture}[$id]; |
580 | } while $self->{texture}[$id]; |
522 | |
581 | |
523 | CFPlus::DB::get tilecache => $id, sub { |
582 | CFPlus::DB::exists tilecache => $id, sub { |
524 | my ($data) = @_; |
583 | my ($exists) = @_; |
525 | |
584 | |
526 | return unless $self->{map}; # stop when destroyed |
585 | return unless $self->{map}; # stop when destroyed |
527 | |
586 | |
528 | $self->set_texture ($id => $data) |
587 | if ($exists) { |
529 | if defined $data; |
588 | $self->have_tile ($id); |
|
|
589 | $self->{texture}[$id]->upload; |
|
|
590 | } |
530 | |
591 | |
531 | $self->bg_fetch; |
592 | $self->bg_fetch; |
532 | }; |
593 | }; |
533 | } |
594 | } |
534 | |
595 | |
535 | sub load_map($$$) { |
596 | sub load_map($$$) { |
536 | my ($self, $hash, $x, $y) = @_; |
597 | my ($self, $hash, $x, $y) = @_; |
537 | |
598 | |
538 | my $gen = $self->{map_change_gen}; |
599 | my $gen = $self->{map_change_gen}; |
539 | |
600 | |
540 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
601 | my $cb = sub { |
541 | return unless $gen == $self->{map_change_gen}; |
602 | return unless $gen == $self->{map_change_gen}; |
542 | |
603 | |
543 | my ($data) = @_; |
604 | my ($data) = @_; |
544 | |
605 | |
545 | if (defined $data) { |
606 | if (defined $data) { |
|
|
607 | $self->{map_cache_new}{$hash} = \$data; |
|
|
608 | |
546 | $data = Compress::LZF::decompress $data; |
609 | my $data = Compress::LZF::decompress $data; |
547 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
548 | |
610 | |
549 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
611 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
550 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
612 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
551 | $self->bg_fetch unless $inprogress; |
613 | $self->bg_fetch unless $inprogress; |
552 | } |
614 | } |
553 | }; |
615 | }; |
|
|
616 | |
|
|
617 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
618 | $cb->($$rdata); |
|
|
619 | } else { |
|
|
620 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
|
|
621 | } |
554 | } |
622 | } |
555 | |
623 | |
556 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
624 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
557 | # (server resource,s latency, bandwidth), so this hack is warranted. |
625 | # (server resource,s latency, bandwidth), so this hack is warranted. |
558 | # the right fix is to make real tiled maps with an overview file |
626 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
651 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
719 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
652 | |
720 | |
653 | $self->flush_map; |
721 | $self->flush_map; |
654 | |
722 | |
655 | ++$self->{map_change_gen}; |
723 | ++$self->{map_change_gen}; |
|
|
724 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
656 | |
725 | |
657 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
726 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
658 | |
727 | |
659 | my $mapmapw = $self->{mapmap}->{w}; |
728 | my $mapmapw = $self->{mapmap}->{w}; |
660 | my $mapmaph = $self->{mapmap}->{h}; |
729 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
679 | } |
748 | } |
680 | |
749 | |
681 | sub face_find { |
750 | sub face_find { |
682 | my ($self, $facenum, $face, $cb) = @_; |
751 | my ($self, $facenum, $face, $cb) = @_; |
683 | |
752 | |
684 | my $hash = "$face->{chksum},$face->{name}"; |
753 | if ($face->{type} == 0) { # FT_FACE |
685 | |
|
|
686 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
754 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
687 | |
755 | |
688 | $face->{id} = $id; |
756 | $face->{id} = $id; |
689 | $self->{faceid}[$facenum] = $id; |
757 | $self->{faceid}[$facenum] = $id; |
690 | |
758 | |
691 | $self->{map}->set_tileid ($facenum => $id); |
759 | $self->{map}->set_tileid ($facenum => $id); |
692 | |
760 | |
693 | CFPlus::DB::get tilecache => $id, $cb; |
761 | CFPlus::DB::get tilecache => $id, $cb; |
|
|
762 | |
|
|
763 | } elsif ($face->{type} & 1) { # with metadata |
|
|
764 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
765 | } |
694 | } |
766 | } |
695 | |
767 | |
696 | sub face_update { |
768 | sub face_update { |
697 | my ($self, $facenum, $face, $changed) = @_; |
769 | my ($self, $facenum, $face, $changed) = @_; |
698 | |
770 | |
|
|
771 | if ($face->{type} == 0) { # FT_FACE |
699 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
772 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
700 | if $changed; |
773 | if $changed; |
701 | |
774 | |
702 | $self->set_texture ($face->{id} => delete $face->{image}); |
775 | $self->have_tile ($face->{id}); |
|
|
776 | |
|
|
777 | } elsif ($face->{type} & 1) { # split metadata |
|
|
778 | if ($changed) { # new data |
|
|
779 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
|
|
780 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
|
|
781 | |
|
|
782 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
783 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; |
|
|
784 | } else { |
|
|
785 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
786 | } |
|
|
787 | |
|
|
788 | ::add_license ($face); |
|
|
789 | |
|
|
790 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
791 | $self->{music_meta}{$facenum} = $face; |
|
|
792 | |
|
|
793 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
794 | if $changed; |
|
|
795 | |
|
|
796 | &::audio_music_push ($facenum); |
|
|
797 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
798 | $self->{sound_meta}{$facenum} = $face; |
|
|
799 | |
|
|
800 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
801 | if $changed; |
|
|
802 | |
|
|
803 | &::audio_sound_push ($facenum); |
|
|
804 | } |
|
|
805 | |
|
|
806 | } |
703 | } |
807 | } |
704 | |
808 | |
705 | sub smooth_update { |
809 | sub smooth_update { |
706 | my ($self, $facenum, $face) = @_; |
810 | my ($self, $facenum, $face) = @_; |
707 | |
811 | |
708 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
812 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
709 | } |
813 | } |
710 | |
814 | |
711 | sub set_texture { |
815 | sub have_tile { |
|
|
816 | my ($self, $tile) = @_; |
|
|
817 | |
|
|
818 | return unless $self->{map}; |
|
|
819 | |
|
|
820 | my $tex = $self->{texture}[$tile] ||= |
|
|
821 | new CFPlus::Texture |
|
|
822 | tile => $tile, minify => 1, mipmap => 1, delay => 1; |
|
|
823 | |
|
|
824 | $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; |
|
|
825 | } |
|
|
826 | |
|
|
827 | sub connect_face_update { |
712 | my ($self, $id, $data) = @_; |
828 | my ($self, $id, $cb) = @_; |
713 | |
829 | |
714 | $self->{texture}[$id] = my $tex = |
830 | push @{$self->{face_cb}{$id}}, $cb; |
715 | new_from_image CFPlus::Texture |
|
|
716 | $data, minify => 1, mipmap => 1; |
|
|
717 | |
831 | |
718 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
832 | CFPlus::guard { |
719 | $self->{map_widget}->update; |
833 | @{$self->{face_cb}{$id}} |
|
|
834 | = grep $_ != $cb, |
|
|
835 | @{$self->{face_cb}{$id}}; |
|
|
836 | } |
720 | } |
837 | } |
721 | |
838 | |
722 | sub sound_play { |
839 | sub sound_play { |
723 | my ($self, $x, $y, $soundnum, $type) = @_; |
840 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
724 | |
841 | |
725 | $self->{sound_play}->($x, $y, $soundnum, $type); |
842 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
843 | unless $type & 1; # odd types are silent for future expansion |
726 | } |
844 | } |
727 | |
845 | |
728 | my $LAST_QUERY; # server is stupid, stupid, stupid |
846 | my $LAST_QUERY; # server is stupid, stupid, stupid |
729 | |
847 | |
730 | sub query { |
848 | sub query { |
… | |
… | |
795 | $self->{$type} = $text; |
913 | $self->{$type} = $text; |
796 | } else { |
914 | } else { |
797 | $self->logprint ("msg: ", $text); |
915 | $self->logprint ("msg: ", $text); |
798 | return if $color < 0; # negative color == ignore if not understood |
916 | return if $color < 0; # negative color == ignore if not understood |
799 | |
917 | |
800 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
918 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
801 | |
919 | |
802 | ## try to create single paragraphs of multiple lines sent by the server |
920 | ## try to create single paragraphs of multiple lines sent by the server |
803 | # no longer neecssary with TRT servers |
921 | # no longer neecssary with TRT servers |
804 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
922 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
805 | |
923 | |
806 | ::message ({ fg => $fg, markup => $_ }) |
924 | ::message ({ |
|
|
925 | fg => $fg, |
|
|
926 | markup => $_, |
|
|
927 | type => $type, |
|
|
928 | extra => [@extra], |
|
|
929 | color_flags => $color |
807 | for split /\n/, $text; |
930 | }) for split /\n/, $text; |
808 | |
931 | |
809 | $self->{statusbox}->add ($text, |
932 | $self->{statusbox}->add ($text, |
810 | group => $text, |
933 | group => $text, |
811 | fg => $fg, |
934 | fg => $fg, |
812 | timeout => $color >= 2 ? 180 : 10, |
935 | timeout => $color >= 2 ? 180 : 10, |
… | |
… | |
868 | $self->{map_widget}->clr_commands; |
991 | $self->{map_widget}->clr_commands; |
869 | |
992 | |
870 | ::stop_game (); |
993 | ::stop_game (); |
871 | } |
994 | } |
872 | |
995 | |
873 | sub image_info { |
|
|
874 | my ($self, $numfaces) = @_; |
|
|
875 | |
|
|
876 | $self->{num_faces} = $numfaces; |
|
|
877 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
878 | $self->face_prefetch; |
|
|
879 | } |
|
|
880 | |
|
|
881 | sub face_prefetch { |
|
|
882 | my ($self) = @_; |
|
|
883 | |
|
|
884 | return unless $::CFG->{face_prefetch}; |
|
|
885 | |
|
|
886 | if ($self->{num_faces}) { |
|
|
887 | return if @{ $self->{send_queue} || [] }; |
|
|
888 | my $todo = @{ $self->{face_prefetch} } |
|
|
889 | or return; |
|
|
890 | |
|
|
891 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
892 | |
|
|
893 | $self->send ("requestinfo image_sums $face $face"); |
|
|
894 | |
|
|
895 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
896 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
897 | } elsif (!exists $self->{num_faces}) { |
|
|
898 | $self->send ("requestinfo image_info"); |
|
|
899 | |
|
|
900 | $self->{num_faces} = 0; |
|
|
901 | |
|
|
902 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
903 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
904 | } |
|
|
905 | } |
|
|
906 | |
|
|
907 | sub update_floorbox { |
996 | sub update_floorbox { |
908 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
997 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
909 | return unless $::CONN; |
998 | return unless $::CONN; |
910 | |
999 | |
911 | $::FLOORBOX->clear; |
1000 | $::FLOORBOX->clear; |
|
|
1001 | |
|
|
1002 | my @add; |
912 | |
1003 | |
913 | my $row; |
1004 | my $row; |
914 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1005 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
915 | if ($row < 6) { |
1006 | if ($row < 6) { |
916 | local $_->{face_widget}; # hack to force recreation of widget |
1007 | local $_->{face_widget}; # hack to force recreation of widget |
917 | local $_->{desc_widget}; # hack to force recreation of widget |
1008 | local $_->{desc_widget}; # hack to force recreation of widget |
918 | CFPlus::Item::update_widgets $_; |
1009 | CFPlus::Item::update_widgets $_; |
919 | |
1010 | |
|
|
1011 | push @add, |
920 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1012 | 0, $row, $_->{face_widget}, |
921 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1013 | 1, $row, $_->{desc_widget}; |
922 | |
1014 | |
923 | $row++; |
1015 | $row++; |
924 | } else { |
1016 | } else { |
925 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1017 | push @add, 1, $row, new CFPlus::UI::Button |
926 | text => "More...", |
1018 | text => "More...", |
927 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1019 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
928 | ); |
1020 | ; |
929 | last; |
1021 | last; |
930 | } |
1022 | } |
931 | } |
1023 | } |
932 | if ($::CONN->{open_container}) { |
1024 | if ($::CONN->{open_container}) { |
933 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1025 | push @add, 1, $row++, new CFPlus::UI::Button |
934 | text => "Close container", |
1026 | text => "Close container", |
935 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1027 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
936 | ); |
1028 | ; |
937 | } |
1029 | } |
938 | }); |
|
|
939 | |
1030 | |
|
|
1031 | $::FLOORBOX->add_at (@add); |
|
|
1032 | }); |
|
|
1033 | |
940 | $::WANT_REFRESH++; |
1034 | $::WANT_REFRESH->start; |
941 | } |
1035 | } |
942 | |
1036 | |
943 | sub set_opencont { |
1037 | sub set_opencont { |
944 | my ($conn, $tag, $name) = @_; |
1038 | my ($conn, $tag, $name) = @_; |
945 | $conn->{open_container} = $tag; |
1039 | $conn->{open_container} = $tag; |
… | |
… | |
1062 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1156 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1063 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1157 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1064 | . "map size $self->{mapw}×$self->{maph}\n" |
1158 | . "map size $self->{mapw}×$self->{maph}\n" |
1065 | ); |
1159 | ); |
1066 | |
1160 | |
1067 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
|
|
1068 | } |
1161 | } |
1069 | |
1162 | |
1070 | sub logged_in { |
1163 | sub logged_in { |
1071 | my ($self) = @_; |
1164 | my ($self) = @_; |
1072 | |
1165 | |
1073 | $self->send_ext_req (cfplus_support => version => 1, sub { |
1166 | $self->send_ext_req (cfplus_support => version => 2, sub { |
|
|
1167 | my (%msg) = @_; |
|
|
1168 | |
1074 | $self->{cfplus_ext} = $_[0]{version}; |
1169 | $self->{cfplus_ext} = $msg{version}; |
1075 | $self->update_server_info; |
1170 | $self->update_server_info; |
1076 | |
1171 | |
1077 | if ($self->{cfplus_ext} >= 2) { |
1172 | if ($self->{cfplus_ext} >= 2) { |
1078 | $self->send_ext_req ("editor_support", sub { |
1173 | $self->send_ext_req ("editor_support", sub { |
1079 | $self->{editor_support} = $_[0]; |
1174 | $self->{editor_support} = { @_ }; |
1080 | $self->update_server_info; |
1175 | $self->update_server_info; |
1081 | |
1176 | |
1082 | 0 |
1177 | 0 |
1083 | }); |
1178 | }); |
1084 | } |
1179 | } |
… | |
… | |
1092 | $self->send_command ("output-count $::CFG->{output_count}"); |
1187 | $self->send_command ("output-count $::CFG->{output_count}"); |
1093 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1188 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1094 | $self->send_command ("pickup $::CFG->{pickup}"); |
1189 | $self->send_command ("pickup $::CFG->{pickup}"); |
1095 | } |
1190 | } |
1096 | |
1191 | |
1097 | sub buildat { |
|
|
1098 | my ($self, $builditem, $x, $y) = @_; |
|
|
1099 | |
|
|
1100 | if ($self->{cfplus_ext}) { |
|
|
1101 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
1102 | } |
|
|
1103 | } |
|
|
1104 | |
|
|
1105 | sub lookat { |
1192 | sub lookat { |
1106 | my ($self, $x, $y) = @_; |
1193 | my ($self, $x, $y) = @_; |
1107 | |
1194 | |
1108 | if ($self->{cfplus_ext}) { |
1195 | if ($self->{cfplus_ext}) { |
1109 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
1196 | $self->send_ext_req (lookat => $x, $y, sub { |
1110 | my ($msg) = @_; |
1197 | my (%msg) = @_; |
1111 | |
1198 | |
1112 | if (exists $msg->{npc_dialog}) { |
1199 | if (exists $msg{npc_dialog}) { |
1113 | # start npc chat dialog |
1200 | # start npc chat dialog |
1114 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1201 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1115 | dx => $x, |
1202 | token => $msg{npc_dialog}, |
1116 | dy => $y, |
|
|
1117 | title => "$msg->{npc_dialog} (NPC)", |
1203 | title => "$msg{npc_dialog}[0] (NPC)", |
1118 | conn => $self, |
1204 | conn => $self, |
1119 | ; |
1205 | ; |
1120 | } |
1206 | } |
1121 | }); |
1207 | }); |
1122 | } |
1208 | } |
… | |
… | |
1129 | |
1215 | |
1130 | (delete $self->{npc_dialog})->destroy |
1216 | (delete $self->{npc_dialog})->destroy |
1131 | if $self->{npc_dialog}; |
1217 | if $self->{npc_dialog}; |
1132 | |
1218 | |
1133 | $self->SUPER::destroy; |
1219 | $self->SUPER::destroy; |
|
|
1220 | |
|
|
1221 | %$self = (); |
1134 | } |
1222 | } |
1135 | |
1223 | |
1136 | package CFPlus::NPCDialog; |
1224 | package CFPlus::NPCDialog; |
1137 | |
1225 | |
1138 | our @ISA = 'CFPlus::UI::Toplevel'; |
1226 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1185 | on_activate => sub { $this->destroy; 1 }, |
1273 | on_activate => sub { $this->destroy; 1 }, |
1186 | ; |
1274 | ; |
1187 | |
1275 | |
1188 | $self->update_options; |
1276 | $self->update_options; |
1189 | |
1277 | |
1190 | $self->{id} = $self->{conn}->send_ext_req ( |
1278 | $self->{id} = "npc-channel-" . $self->{conn}->token; |
1191 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
1279 | $self->{conn}->connect_ext ($self->{id} => sub { |
1192 | sub { $this && $this->feed (@_) } |
1280 | $this->feed (@_) if $this; |
1193 | ); |
1281 | }); |
|
|
1282 | |
|
|
1283 | $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token}); |
1194 | |
1284 | |
1195 | $self->{entry}->grab_focus; |
1285 | $self->{entry}->grab_focus; |
1196 | |
1286 | |
1197 | $self->{textview}->add_paragraph ({ |
1287 | $self->{textview}->add_paragraph ({ |
1198 | fg => [1, 1, 0, 1], |
1288 | fg => [1, 1, 0, 1], |
… | |
… | |
1221 | ); |
1311 | ); |
1222 | } |
1312 | } |
1223 | } |
1313 | } |
1224 | |
1314 | |
1225 | sub feed { |
1315 | sub feed { |
1226 | my ($self, $msg) = @_; |
1316 | my ($self, $type, @arg) = @_; |
1227 | |
1317 | |
1228 | CFPlus::weaken $self; |
1318 | CFPlus::weaken $self; |
1229 | |
1319 | |
1230 | if ($msg->{msgtype} eq "reply") { |
1320 | if ($type eq "update") { |
|
|
1321 | my (%info) = @arg; |
|
|
1322 | |
1231 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1323 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1232 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1324 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1233 | |
|
|
1234 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
|
|
1235 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1236 | my @link; |
|
|
1237 | $text =~ s{ |
|
|
1238 | ($match) |
|
|
1239 | }{ |
|
|
1240 | my $kw = $1; |
|
|
1241 | |
|
|
1242 | push @link, new CFPlus::UI::Label |
|
|
1243 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1244 | can_hover => 1, |
|
|
1245 | can_events => 1, |
|
|
1246 | padding_x => 0, |
|
|
1247 | padding_y => 0, |
|
|
1248 | on_button_up => sub { |
|
|
1249 | $self->send ($kw); |
|
|
1250 | }; |
|
|
1251 | |
|
|
1252 | "\x{fffc}" |
|
|
1253 | }giex; |
|
|
1254 | |
1325 | |
|
|
1326 | if (exists $info{msg}) { |
|
|
1327 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
|
|
1328 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1329 | my @link; |
|
|
1330 | $text =~ s{ |
|
|
1331 | ($match) |
|
|
1332 | }{ |
|
|
1333 | my $kw = $1; |
|
|
1334 | |
|
|
1335 | push @link, new CFPlus::UI::Label |
|
|
1336 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1337 | can_hover => 1, |
|
|
1338 | can_events => 1, |
|
|
1339 | padding_x => 0, |
|
|
1340 | padding_y => 0, |
|
|
1341 | on_button_up => sub { |
|
|
1342 | $self->send ($kw); |
|
|
1343 | }; |
|
|
1344 | |
|
|
1345 | "\x{fffc}" |
|
|
1346 | }giex; |
|
|
1347 | |
1255 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1348 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1256 | $self->{textview}->scroll_to_bottom; |
1349 | $self->{textview}->scroll_to_bottom; |
|
|
1350 | } |
|
|
1351 | |
1257 | $self->update_options; |
1352 | $self->update_options; |
1258 | } else { |
1353 | } else { |
1259 | $self->destroy; |
1354 | $self->destroy; |
1260 | } |
1355 | } |
1261 | |
1356 | |
… | |
… | |
1266 | my ($self, $msg) = @_; |
1361 | my ($self, $msg) = @_; |
1267 | |
1362 | |
1268 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1363 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1269 | $self->{textview}->scroll_to_bottom; |
1364 | $self->{textview}->scroll_to_bottom; |
1270 | |
1365 | |
1271 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1366 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1272 | } |
1367 | } |
1273 | |
1368 | |
1274 | sub destroy { |
1369 | sub destroy { |
1275 | my ($self) = @_; |
1370 | my ($self) = @_; |
1276 | |
1371 | |
1277 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1372 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1278 | |
1373 | |
1279 | if ($self->{conn}) { |
1374 | if ($self->{conn}) { |
1280 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1375 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1281 | delete $self->{conn}{npc_dialog}; |
1376 | delete $self->{conn}{npc_dialog}; |
1282 | $self->{conn}->disconnect_ext ($self->{id}); |
1377 | $self->{conn}->disconnect_ext ($self->{id}); |
1283 | } |
1378 | } |
1284 | |
1379 | |
1285 | $self->SUPER::destroy; |
1380 | $self->SUPER::destroy; |