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.63 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.228 by root, Wed Nov 21 13:23:10 2012 UTC

1package CFClient::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
5use Guard ();
6
6use Crossfire::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use CFClient; 9use DC;
9use CFClient::UI; 10use DC::DB;
11use DC::UI;
12use DC::Macro;
13use DC::Item;
10 14
11use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1, wrap => 1;
22
23sub MIN_TEXTURE_UNUSED() { 1 }#d#
12 24
13sub new { 25sub new {
14 my $class = shift; 26 my ($class, %arg) = @_;
15 27
16 my $self = $class->SUPER::new (@_); 28 my $self = $class->SUPER::new (%arg,
17 29 setup_req => {
18 $self->{map_widget}->clr_commands; 30 extmap => 1,
19 31 widget => 2,
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 32 %{$arg{setup_req} || {}},
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next;
28
29 my $cmd = $1;
30 my @args = split /\|/, $2;
31 @args = (".*") unless @args;
32
33 $_ = $_ eq ".*" ? "" : " $_"
34 for @args;
35
36 my $text = CFClient::pod_to_pango $head2->content;
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) }
40 @args;
41 } 33 },
34 );
42 35
43 \@cmd_help 36 $self->update_fx_want;
37
38 my $exp_guard = $self->addme_guard;
39 my $skl_guard = $self->addme_guard;
40 my $spl_guard = $self->addme_guard;
41 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
42 my ($exp, $skl, $spl) = @_;
43
44 $self->register_face_handler ($exp, sub {
45 my ($face) = @_;
46
47 undef $exp_guard;
48 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
49 $_->() for values %{ $self->{on_exp_update} };
50 });
51
52 $self->register_face_handler ($skl, sub {
53 my ($face) = @_;
54
55 undef $skl_guard;
56 my $info = $self->{json_coder}->decode (delete $face->{data});
57 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
58 });
59
60 $self->register_face_handler ($spl, sub {
61 my ($face) = @_;
62
63 undef $spl_guard;
64 my $info = $self->{json_coder}->decode (delete $face->{data});
65 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
66 });
67
68 ()
69 });
70
71 $::COMPLETER->reset;
72
73 $self->{json_coder}
74 ->convert_blessed
75 ->filter_json_single_key_object ("\fw" => sub {
76 $self->{widget}{$_[0]}
77 })
78 ->filter_json_single_key_object ("\fc" => sub {
79 my ($id) = @_;
80 sub {
81 $self->send_exti_msg (w_e => $id, @_);
82 }
83 });
84
85 # destroy widgets on logout
86 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
87 for my $ws (values %{delete $self->{widgetset} || {}}) {
88 $_->destroy
89 for values %{delete $ws->{w} || {}};
90 }
91
92 delete $self->{items};
93 $::INV->clear;
94 $::INVR->clear;
95 $::INVR_HB->clear;
96 $::FLOORBOX->clear;
97 });
98
99 {
100 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
101 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
102 }
103
104 {
105 $self->{noface} = my $tex = $TEX_NOFACE;
106 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
107 }
108
109# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
110# $self->{expire_w} = AE::timer 1, 1, sub {
111# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
112#
113# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
114# warn DC::SvREFCNT $self->{texture}[$_];
115# $self->{texture}[$_]->unload;
116# warn "expire texture $_\n";#d#
117# }
118#
119# ($self->{expire_count} += $count) < @{ $self->{texture} }
120# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
121# warn "count is $count\n";#d#
122# };
123
124 $self->{open_container} = 0;
125
126 # per server
127 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
128
129 $self
130}
131
132 #$self->send_exti_req (nickmon => 1, sub { use Data::Dump; ddx \@_ });#d#
133#sub ext_nicklist { shift; use Data::Dump; ddx \@_; } #d#
134
135sub update_fx_want {
136 my ($self) = @_;
137
138 $self->send_exti_msg (fx_want => {
139 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
140 5 => !!$::CFG->{audio_enable}, # FT_SOUND
141 6 => 1, # FT_RSRC
142 });
143}
144
145sub ext_capabilities {
146 my ($self, %cap) = @_;
147
148 if (my $ts = $cap{tileset}) {
149 if (my ($default) = grep $_->[2] & 1, @$ts) {
150 $self->{tileset} = $default;
151 $self->{tilesize} = $default->[3];
152 $self->setup_req (tileset => $default->[0]);
153
154 my $w = int $self->{mapw} * 32 / $self->{tilesize};
155 my $h = int $self->{maph} * 32 / $self->{tilesize};
156
157 $self->setup_req (mapsize => "${w}x${h}");
158 }
159 }
160}
161
162sub ext_ambient_music {
163 my ($self, $songs) = @_;
164 &::audio_music_set_ambient ($songs);
165}
166
167sub ext_command_list {
168 my ($self, @faces) = @_;
169
170 my $handler = $self->{command_facehandler} = {};
171 my $commands = $::COMPLETER->{command_list} = {};
172
173 for my $idx (@faces) {
174 $handler->{$idx} = $self->register_face_handler ($idx, sub {
175 my ($face) = @_;
176
177 $commands->{$idx} =
178 $face->{cache} ||= $self->{json_coder}->decode ($face->{data});
179 });
180 }
181}
182
183#############################################################################
184
185sub widget_associate {
186 my ($self, $ws, $id, $widget) = @_;
187
188 $widget ||= new DC::UI::Bin;
189
190 $widget->{s_id} = $id;
191 $self->{widget}{$id} = $widget;
192
193 if ($ws) {
194 $widget->{s_ws} = $ws;
195 $self->{widgetset}{$ws}{w}{$id} = $widget;
196 }
197
198 $widget->connect (on_destroy => sub {
199 my ($widget) = @_;
200
201 delete $self->{widget}{$widget->{s_id}};
202 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
203 if exists $widget->{s_ws};
204 });
205}
206
207# widgetset new
208sub ext_ws_n {
209 my ($self, $id) = @_;
210
211 $self->{widgetset}{$id} = {
212 w => {},
44 }; 213 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
48
49 $self->{noface} = new_from_file CFClient::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
51
52 $self->{open_container} = 0;
53
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60
61 $self
62} 214}
215
216# widgetset destroy
217sub ext_ws_d {
218 my ($self, $id) = @_;
219
220 my $ws = delete $self->{widgetset}{$id}
221 or return;
222
223 $_->destroy
224 for values %{$ws->{w}};
225}
226
227# widgetset create
228sub ext_ws_c {
229 my ($self, $ws, $id, $class, $args) = @_;
230
231 $self->widget_associate (
232 $ws, $id => scalar eval {
233 local $SIG{__DIE__};
234 "DC::UI::$class"->new (%$args)
235 }
236 );
237}
238
239# widgetset create template
240sub ext_ws_ct {
241 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
242
243 $done_cb ||= sub { };
244
245 my $parse_list; $parse_list = sub {
246 my ($list) = @_;
247 my @w;
248
249 while (@$list) {
250 my ($class, $args) = splice @$list, 0, 2;
251 my $name = delete $args->{s_id};
252 my $cl = delete $args->{s_cl};
253 my $cfg = delete $cfg->{$name};
254 my $id = delete $cfg->{id};
255 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
256 or next;
257
258 $self->widget_associate ($ws, $id, $w)
259 if $id;
260
261 $w->add ($parse_list->($cl))
262 if $cl;
263
264 push @w, $w;
265 }
266
267 @w
268 };
269
270 # either array reference, or face #
271 if ($type eq "inline") {
272 $done_cb->();
273 $parse_list->($template);
274 } elsif ($type eq "face") {
275 my $handler; $handler = $self->register_face_handler ($template, sub {
276 my ($face) = @_;
277
278 undef $handler;
279 $done_cb->();
280 $parse_list->($self->{json_coder}->decode ($face->{data}));
281 });
282 } else {
283 $done_cb->(0);
284 }
285}
286
287# widgetset associate
288sub ext_ws_a {
289 my ($self, %ass) = @_;
290
291 # everything that has a name, wether conceivably useful or not
292 my %wkw = (
293 root => $DC::UI::ROOT,
294 tooltip => $DC::UI::TOOLTIP,
295
296 mapwidget => $::MAPWIDGET,
297 menubar => $::MENUBAR,
298 menupopup => $::MENUPOPUP,
299 pickup_enable => $::PICKUP_ENABLE,
300 buttonbar => $::BUTTONBAR,
301 metaserver => $::METASERVER,
302 buttonbar => $::BUTTONBAR,
303 login_button => $::LOGIN_BUTTON,
304 quit_dialog => $::QUIT_DIALOG,
305 host_entry => $::HOST_ENTRY,
306 metaserver => $::METASERVER,
307 server_info => $::SERVER_INFO,
308
309 setup_dialog => $::SETUP_DIALOG,
310 setup_notebook => $::SETUP_NOTEBOOK,
311 setup_server => $::SETUP_SERVER,
312 setup_keyboard => $::SETUP_KEYBOARD,
313
314 pl_notebook => $::PL_NOTEBOOK,
315 pl_window => $::PL_WINDOW,
316 inventory_page => $::INVENTORY_PAGE,
317 stats_page => $::STATS_PAGE,
318 skill_page => $::SKILL_PAGE,
319 spell_page => $::SPELL_PAGE,
320 spell_list => $::SPELL_LIST,
321
322 floorbox => $::FLOORBOX,
323 help_window => $::HELP_WINDOW,
324 message_window => $::MESSAGE_WINDOW,
325 message_dist => $::MESSAGE_DIST,
326 statusbox => $::STATUSBOX,
327
328 inv => $::INV,
329 invr => $::INVR,
330 invr_hb => $::INVR_HB,
331 );
332
333 while (my ($id, $name) = each %ass) {
334 $self->widget_associate (undef, $id => $wkw{$name});
335 }
336}
337
338# widget call
339sub ext_w_c {
340 my ($self, $id, $rcb, $method, @args) = @_;
341
342 my $w = $self->{widget}{$id}
343 or return;
344
345 if ($rcb) {
346 $rcb->($w->$method (@args));
347 } else {
348 $w->$method (@args);
349 }
350}
351
352# widget set
353sub ext_w_s {
354 my ($self, $id, $attr) = @_;
355
356 my $w = $self->{widget}{$id}
357 or return;
358
359 for (my $i = 0; $i < $#$attr; $i += 2) {
360 my ($member, $value) = @$attr[$i, $i+1];
361 if (defined $value) {
362 $w->{$member} = $value;
363 } else {
364 delete $w->{$member};
365 }
366 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
367 }
368}
369
370# widget get
371sub ext_w_g {
372 my ($self, $id, $rid, @attr) = @_;
373
374 my $w = $self->{widget}{$id}
375 or return;
376
377 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
378}
379
380# message window
381sub ext_channel_info {
382 my ($self, $info) = @_;
383 $self->{channels}->{$info->{id}} = $info;
384 $::MESSAGE_DIST->add_channel ($info);
385}
386
387#############################################################################
63 388
64sub logprint { 389sub logprint {
65 my ($self, @a) = @_; 390 my ($self, @a) = @_;
66 391
67 $self->{log_fh} ||= do { 392 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
68 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69
70 open my $fh, ">>:utf8", $path
71 or die "Couldn't open logfile $path: $!";
72
73 $fh->autoflush (1);
74
75 $fh;
76 };
77
78 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
79
80 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
81 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
82
83 print {$self->{log_fh}} "$ts ", @a, "\n";
84} 393}
85 394
86sub _stat_numdiff { 395sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_; 396 my ($self, $name, $old, $new) = @_;
88 397
… …
106 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 415 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
107 : () 416 : ()
108 } 417 }
109 sort { $a <=> $b } keys %{$self->{spell_paths}}; 418 sort { $a <=> $b } keys %{$self->{spell_paths}};
110 419
111 join "", @diff 420 "\u$name: " . (join ", ", @diff)
112} 421}
113 422
114# all stats that are chacked against changes 423# all stats that are chacked against changes
115my @statchange = ( 424my @statchange = (
116 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 425 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
159 468
160 if (my @diffs = 469 if (my @diffs =
161 ( 470 (
162 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 471 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
163 map { 472 map {
164 $stats->{$_} && $prev->{$_} 473 $stats->{$_} && $prev->{$_}
165 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 474 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
166 } sort { $a <=> $b } keys %{$self->{skill_info}} 475 } sort { $a <=> $b } keys %{$self->{skill_info}}
167 ) 476 )
168 ) { 477 ) {
169 my $msg = join " ", @diffs; 478 my $msg = join " ", @diffs;
… …
171 } 480 }
172 481
173 if ( 482 if (
174 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 483 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
175 ) { 484 ) {
176 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 485 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
177 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 486 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
178 } 487 }
179 488
180 $self->update_stats_window ($stats, $prev); 489 $self->update_stats_window ($stats, $prev);
181 490
182 $self->{prev_stats} = { %$stats }; 491 $self->{prev_stats} = { %$stats };
… …
219 528
220 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 529 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 530 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 531 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 532 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 533 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 534 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 535 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
227 $rng =~ s/^Range: //; # thank you so much dear server 536 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 537 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 538 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 539 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 540
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 541 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 550 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 551 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 552 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 553 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 554
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 555 $self->update_weight;
248 556
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 557 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 558 for keys %RES_TBL;
251 559
252 my $sktbl = $::STATWIDS->{skill_tbl}; 560 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 561 my @skills = keys %{ $self->{skill_info} };
254 562
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 563 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
564 map [$_, $self->{skill_info}{$_}],
565 grep exists $stats->{$_},
566 @skills;
567
568 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
569 $self->{stat_order} = join ",", map $_->[0], @order;
570
256 $sktbl->clear; 571 $sktbl->clear;
257 572
573 my $sw = $self->{skillwid}{""} ||= [
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 574 0, 0, (new DC::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 575 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 576 2, 0, (new DC::UI::Label text => "Progress"),
577 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 578 4, 0, (new DC::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 579 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 580 6, 0, (new DC::UI::Label text => "Progress"),
581 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
582 ];
264 583
584 my @add = @$sw;
585
586 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
587
588 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
589 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
590
265 my ($x, $y) = (1, 0); 591 my ($x, $y) = (0, 1);
266 for ( 592 for (@order) {
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_},
270 @skills
271 ) {
272 my ($idx, $name) = @$_; 593 my ($idx, $name) = @$_;
273 594
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 595 my $spell_cb = sub {
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 596 my ($widget, $ev) = @_;
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 597
598 if ($ev->{button} == 1) {
599 $::CONN->user_send ("ready_skill $name");
600 } elsif ($ev->{button} == 2) {
601 $::CONN->user_send ("use_skill $name");
602 } elsif ($ev->{button} == 3) {
603 my $shortname = DC::shorten $name, 14;
604 (new DC::UI::Menu
605 items => [
606 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
607 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
608 ],
609 )->popup ($ev);
610 } else {
611 return 0;
612 }
613
614 1
615 };
616
617 my $sw = $self->{skillwid}{$idx} ||= [
618 # exp
619 (new DC::UI::Label
620 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
621
622 # level
623 (new DC::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 624 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 625
626 # progress
627 (new DC::UI::ExperienceProgress),
628
629 # label
630 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
631 can_events => 1, can_hover => 1, tooltip => "#(skill/$name)$TOOLTIP_ALL"),
632 ];
633
634 push @add,
635 $x * 4 + 0, $y, $sw->[0],
636 $x * 4 + 1, $y, $sw->[1],
637 $x * 4 + 2, $y, $sw->[2],
638 $x * 4 + 3, $y, $sw->[3],
639 ;
279 640
280 $x++ and ($x, $y) = (0, $y + 1); 641 $x++ and ($x, $y) = (0, $y + 1);
281 } 642 }
282 }
283 643
284 for (grep exists $stats->{$_}, @skills) { 644 $sktbl->add_at (@add);
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 645 }
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 646
647 for (@order) {
648 my ($idx, $name) = @$_;
649 my $val = $stats->{$idx};
650
651 next if $prev->{$idx}[1] eq $val->[1];
652
653 my $sw = $self->{skillwid}{$idx};
654 $sw->[0]->set_text (::formsep ($val->[1]));
655 $sw->[1]->set_text ($val->[0] * 1);
656 $sw->[2]->set_value (@$val);
657
658 $::GAUGES->{skillexp}->set_label ("$name %d%%");
659 $::GAUGES->{skillexp}->set_value (@$val);
287 } 660 }
288} 661}
289 662
290sub user_send { 663sub user_send {
291 my ($self, $command) = @_; 664 my ($self, $command) = @_;
292 665
666 $self->{record}->($command)
293 if ($self->{record}) { 667 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 668
297 $self->logprint ("send: ", $command); 669 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 670 $self->send_command ($command);
299 ::status ($command);
300} 671}
301 672
302sub start_record { 673sub record {
303 my ($self) = @_; 674 my ($self, $cb) = @_;
304 675
305 $self->{record} = []; 676 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 677}
312 678
313sub map_scroll { 679sub map_scroll {
314 my ($self, $dx, $dy) = @_; 680 my ($self, $dx, $dy) = @_;
315 681
316 $self->{map}->scroll ($dx, $dy); 682 $self->{map_widget}->scroll ($dx, $dy);
317} 683}
318 684
319sub feed_map1a { 685sub feed_map1a {
320 my ($self, $data) = @_; 686 my ($self, $data) = @_;
321 687
322 $self->{map}->map1a_update ($data); 688 my $missing = $self->{map}->map1a_update ($data);
689 my $delay;
690
691 for my $tile (@$missing) {
692 next if $self->{delay}{$tile};
693
694 $delay = 1;
695
696 if (my $tex = $self->{texture}[$tile]) {
697 $tex->upload;
698 } else {
699 $self->{delay}{$tile} = 1;
700
701 # we assume the face is in-flight and will eventually arrive
702 push @{$self->{tile_cb}{$tile}}, sub {
703 delete $self->{delay}{$tile};
704 $_[0]->upload;
705 };
706 }
707 }
708
709 if ($delay) {
710 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
711 EV::once undef, 0, 0.03, sub {
712 $self->{map_widget}->update
713 if $self->{map_widget};
714 };
715 } else {
323 $self->{map_widget}->update; 716 $self->{map_widget}->update;
717 }
324} 718}
325 719
326sub magicmap { 720sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 721 my ($self, $w, $h, $x, $y, $data) = @_;
328 722
… …
330} 724}
331 725
332sub flush_map { 726sub flush_map {
333 my ($self) = @_; 727 my ($self) = @_;
334 728
335 my $map_info = delete $self->{map_info} 729 return unless $self->{map_info};
336 or return;
337 730
731 for my $map_info (values %{ $self->{map_cache} || {} }) {
338 my ($hash, $x, $y, $w, $h) = @$map_info; 732 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
339 733
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 734 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 735
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 736 if ($data ne $$rdata) {
737 $map_info->[1] = \$data;
738 my $cdata = Compress::LZF::compress $data;
739 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
740 }
741 }
343} 742}
344 743
345sub map_clear { 744sub map_clear {
346 my ($self) = @_; 745 my ($self) = @_;
347 746
348 $self->flush_map; 747 $self->flush_map;
748 delete $self->{map_info};
349 delete $self->{neigh_map}; 749 delete $self->{neigh_map};
350 750
351 $self->{map}->clear; 751 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 752 delete $self->{map_widget}{magicmap};
353} 753}
354 754
755sub bg_fetch {
756 my ($self) = @_;
355 757
758 my $tile;
759
760 do {
761 $tile = pop @{$self->{bg_fetch}}
762 or return;
763 } while $self->{texture}[$tile];
764
765 DC::DB::get tilecache => $tile, sub {
766 my ($data) = @_;
767
768 return unless $self->{map}; # stop when destroyed
769
770 if (defined $data) {
771 $self->have_tile ($tile, $data);
772 $self->{texture}[$tile]->upload;
773 }
774
775 $self->bg_fetch;
776 };
777}
778
356sub load_map($$$) { 779sub load_map($$$$$$) {
357 my ($self, $hash, $x, $y) = @_; 780 my ($self, $hash, $x, $y, $w, $h) = @_;
358 781
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 782 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
360 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 783
366 $self->set_texture ($id => $data); 784 my $cb = sub {
785 $map_info->[1] = \$_[0];
786
787 my $inprogress = @{ $self->{bg_fetch} || [] };
788 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
789 $self->bg_fetch unless $inprogress;
790 };
791
792 if (my $map_info = $self->{map_cache_old}{$hash}) {
793 $cb->(${ $map_info->[1] });
794 } else {
795 my $gen = $self->{map_change_gen};
796
797 DC::DB::get $self->{mapcache} => $hash, sub {
798 return unless $gen == $self->{map_change_gen};
799 return unless defined $_[0];
800 $cb->(Compress::LZF::decompress $_[0]);
367 } 801 };
368 } 802 }
369} 803}
370 804
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 805# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 806# (server resources, latency, bandwidth), so this hack is warranted.
373# the right fix is to make real tiled maps with an overview file 807# the right fix is to make real tiled maps with an overview file
374sub send_mapinfo { 808sub send_mapinfo {
375 my ($self, $data, $cb) = @_; 809 my ($self, $data, $cb) = @_;
376 810
377 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 811 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
402} 836}
403 837
404# this method does a "flood fill" into every tile direction 838# this method does a "flood fill" into every tile direction
405# it assumes that tiles are arranged in a rectangular grid, 839# it assumes that tiles are arranged in a rectangular grid,
406# i.e. a map is the same as the left of the right map etc. 840# i.e. a map is the same as the left of the right map etc.
407# failure to comply are harmless and result in display errors 841# failure to comply is harmless and results in display errors
408# at worst. 842# at worst.
409sub flood_fill { 843sub flood_fill {
410 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 844 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
411 845
412 # the server does not allow map paths > 6 846 # the server does not allow map paths > 6
… …
437 871
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 872 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 873 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 874
441 } else { 875 } else {
876 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 877 $self->send_mapinfo ("spatial $path$tile", sub {
878 return unless $gen == $self->{map_change_gen};
879
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 880 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 881
445 return if $mode ne "spatial"; 882 return if $mode ne "spatial";
446 883
447 $x += $self->{map}->ox; 884 $x += $self->{map}->ox;
448 $y += $self->{map}->oy; 885 $y += $self->{map}->oy;
449 886
450 $self->load_map ($hash, $x, $y) 887 $self->load_map ($hash, $x, $y, $w, $h)
451 unless $self->{neigh_map}{$hash}[5]++;#d# 888 unless $self->{neigh_map}{$hash}[5]++;#d#
452 889
453 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 890 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
454 891
455 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 892 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
461 898
462sub map_change { 899sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 900 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 901
465 $self->flush_map; 902 $self->flush_map;
903
904 ++$self->{map_change_gen};
905 $self->{map_cache_old} = delete $self->{map_cache};
466 906
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 907 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 908
469 my $mapmapw = $self->{mapmap}->{w}; 909 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 910 my $mapmaph = $self->{mapmap}->{h};
… …
482 $self->{map_info} = [$hash, $x, $y, $w, $h]; 922 $self->{map_info} = [$hash, $x, $y, $w, $h];
483 923
484 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 924 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
485 $::STATWIDS->{map}->set_text ("Map: " . $map); 925 $::STATWIDS->{map}->set_text ("Map: " . $map);
486 926
487 $self->load_map ($hash, $x, $y); 927 $self->load_map ($hash, $x, $y, $w, $h);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 928 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 929}
490 930
491sub face_find { 931sub face_find {
492 my ($self, $facenum, $face) = @_; 932 my ($self, $facenum, $face, $cb) = @_;
493 933
494 my $hash = "$face->{chksum},$face->{name}"; 934 if ($face->{type} == 0) { # FT_FACE
935 my $id = DC::DB::get_tile_id_sync $face->{name};
495 936
496 my $id = $self->{facemap}->get ($hash);
497
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 937 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 938 $self->{map}->set_tileid ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d#
523 939
524 my $face = $self->{tilecache}->get ($id); 940 DC::DB::get tilecache => $id, $cb;
525 941
526 if ($face) { 942 } elsif ($face->{type} & 1) { # with metadata
527 #$self->face_prefetch; 943 DC::DB::get res_meta => $face->{name}, $cb;
528 $face 944
529 } else { 945 } else { # no metadata
530 my $tex = $self->{noface}; 946 DC::DB::get res_data => $face->{name}, $cb;
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 }; 947 }
534} 948}
535 949
536sub face_update { 950sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 951 my ($self, $facenum, $face, $changed) = @_;
538 952
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 953 if ($face->{type} == 0) {
954 # image, FT_FACE
955 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
956 if $changed;
540 957
541 $self->set_texture ($face->{id} => delete $face->{image}); 958 $self->have_tile ($face->{id}, delete $face->{data});
542}
543 959
544sub set_texture { 960 } elsif ($face->{type} & 1) {
961 # split metadata case, FT_MUSIC, FT_SOUND
962 if ($changed) { # new data
963 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
964 $face->{data} = $meta;
965
966 # rely on strict ordering here and also on later fetch
967 DC::DB::put res_data => $face->{name} => $data, sub { };
968 DC::DB::put res_meta => $face->{name} => $meta, sub { };
969 }
970
971 $face->{data} = $self->{json_coder}->decode ($face->{data});
972 ::add_license ($face);
973 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
974 if $changed;
975
976 if ($face->{type} == 3) { # FT_MUSIC
977 &::audio_music_push ($facenum);
978 } elsif ($face->{type} == 5) { # FT_SOUND
979 &::audio_sound_push ($facenum);
980 }
981
982 } else {
983 # flat resource case, FT_RSRC
984 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
985 if $changed;
986 }
987
988 if (my $cbs = $self->{face_cb}{$facenum}) {
989 $_->($face, $changed) for @$cbs;
990 }
991}
992
993sub smooth_update {
994 my ($self, $facenum, $face) = @_;
995
996 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
997}
998
999sub have_tile {
545 my ($self, $id, $data) = @_; 1000 my ($self, $tile, $data) = @_;
546 1001
547 $self->{texture}[$id] ||= do { 1002 return unless $self->{map};
548 my $tex =
549 new_from_image CFClient::Texture
550 $data, minify => 1, mipmap => 1;
551 1003
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1004 my $tex = $self->{texture}[$tile] ||=
553 $self->{map_widget}->update; 1005 new DC::Texture
1006 tile => $tile,
1007 image => $data, delete_image => 1,
1008 minify => 1;
554 1009
555 $tex 1010 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1011 $_->($tex) for @$cbs;
556 }; 1012 }
1013}
1014
1015# call in non-void context registers a temporary
1016# hook with handle, otherwise its permanent
1017sub on_face_change {
1018 my ($self, $num, $cb) = @_;
1019
1020 push @{$self->{face_cb}{$num}}, $cb;
1021
1022 defined wantarray
1023 ? Guard::guard {
1024 @{$self->{face_cb}{$num}}
1025 = grep $_ != $cb,
1026 @{$self->{face_cb}{$num}};
1027 }
1028 : ()
1029}
1030
1031# call in non-void context registers a temporary
1032# hook with handle, otherwise its permanent
1033sub register_face_handler {
1034 my ($self, $num, $cb) = @_;
1035
1036 return unless $num;
1037
1038 # invoke if available right now
1039 $cb->($self->{face}[$num], 0)
1040 unless exists $self->{face}[$num]{loading};
1041
1042 # future changes
1043 $self->on_face_change ($num => $cb)
557} 1044}
558 1045
559sub sound_play { 1046sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 1047 my ($self, $type, $face, $dx, $dy, $vol) = @_;
561 1048
562 $self->{sound_play}->($x, $y, $soundnum, $type); 1049 &::audio_sound_play ($face, $dx, $dy, $vol)
1050 unless $type & 1; # odd types are silent for future expansion
563} 1051}
564 1052
565my $LAST_QUERY; # server is stupid, stupid, stupid 1053my $LAST_QUERY; # server is stupid, stupid, stupid
566 1054
567sub query { 1055sub query {
568 my ($self, $flags, $prompt) = @_; 1056 my ($self, $flags, $prompt) = @_;
569 1057
570 $prompt = $LAST_QUERY unless length $prompt; 1058 $prompt = $LAST_QUERY unless length $prompt;
571 $LAST_QUERY = $prompt; 1059 $LAST_QUERY = $prompt;
572 1060
573 $self->{query}-> ($self, $flags, $prompt); 1061 $self->{query}->($self, $flags, $prompt);
574} 1062}
575 1063
576sub drawinfo { 1064our %NAME_TO_COLOR = (
577 my ($self, $color, $text) = @_; 1065 black => 0,
1066 white => 1,
1067 darkblue => 2,
1068 red => 3,
1069 orange => 4,
1070 lightblue => 5,
1071 darkorange => 6,
1072 green => 7,
1073 darkgreen => 8,
1074 grey => 9,
1075 brown => 10,
1076 yellow => 11,
1077 tan => 12,
1078);
578 1079
579 my @color = ( 1080our @CF_COLOR = (
580 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1081 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
581 [1.00, 1.00, 1.00], 1082 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
582 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1083 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
583 [1.00, 0.00, 0.00], 1084 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 1085 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 1086 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 1087 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 1088 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 1089 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 1090 [0.80, 0.80, 0.80],
590 [0.75, 0.61, 0.20], 1091 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 1092 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 1093 [0.74, 0.65, 0.41],
593 ); 1094);
594 1095
1096sub msg {
1097 my ($self, $color, $type, $text, @extra) = @_;
1098
1099 $text = DC::sanitise_cfxml $text;
1100
1101 if (my $cb = $self->{cb_msg}{$type}) {
1102 $_->($self, $color, $type, $text, @extra) for values %$cb;
1103 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1104 $type =~ s/-/_/g;
1105 $self->{$type} = $text;
1106 } else {
595 $self->logprint ("info: ", $text); 1107 $self->logprint ("msg: ", $text);
1108 return if $color < 0; # negative color == ignore if not understood
596 1109
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1110 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
598 1111
599 # try to create single paragraphs of multiple lines sent by the server 1112 ::message ({
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1113 fg => $fg,
1114 markup => $text,
1115 type => $type,
1116 extra => [@extra],
1117 color_flags => $color, #d# ugly, kill
1118 });
601 1119
602 $text = CFClient::UI::Label::escape $text; 1120# $color &= ~NDI_CLEAR; # only clear once for multiline messages
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1121# # actually, this is an ugly design. _we_ should control the channels,
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1122# # not some random other widget, as the channels are clearly protocol-specific.
1123# # then we could also react to flags such as CLEAR without resorting to
1124# # hacks such as color_flags, above.
605 1125
606 $self->{logview}->add_paragraph ($color[$color], $_)
607 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609
610 $self->{statusbox}->add ($text, 1126 $self->{statusbox}->add ($text,
611 group => $text, 1127 group => $text,
612 fg => $color[$color], 1128 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 1129 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 1130 tooltip_font => $::FONT_FIXED,
615 ); 1131 ) if $type eq "info";
616} 1132 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 1133}
623 1134
624sub spell_add { 1135sub spell_add {
625 my ($self, $spell) = @_; 1136 my ($self, $spell) = @_;
626 1137
627 # try to create single paragraphs of multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell.";
631
632 $::SPELL_PAGE->add_spell ($spell); 1138 $::SPELL_LIST->add_spell ($spell);
633 1139 delete $::COMPLETER->{command_list}{spells};
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
636} 1140}
637 1141
638sub spell_delete { 1142sub spell_delete {
639 my ($self, $spell) = @_; 1143 my ($self, $spell) = @_;
640 1144
641 $::SPELL_PAGE->remove_spell ($spell); 1145 $::SPELL_LIST->remove_spell ($spell);
1146 delete $::COMPLETER->{command_list}{spells};
642} 1147}
643 1148
644sub addme_success { 1149sub setup {
645 my ($self) = @_; 1150 my ($self, $setup) = @_;
646 1151
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { 1152 $self->{map_widget}->set_tilesize ($self->{tilesize});
648 my ($pom) = @_; 1153 $::MAP->resize ($self->{mapw}, $self->{maph});
649
650 my %skill_help;
651
652 for my $head2 ($pom->head1->[3]->head2) {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
654 }
655
656 \%skill_help
657 };
658
659 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill});
666 }
667} 1154}
668 1155
669sub eof { 1156sub eof {
670 my ($self) = @_; 1157 my ($self) = @_;
671 1158
672 $self->{map_widget}->clr_commands; 1159 $::COMPLETER->reset;
673 1160
674 ::stop_game (); 1161 ::stop_game ();
675} 1162}
676 1163
677sub image_info {
678 my ($self, $numfaces) = @_;
679
680 $self->{num_faces} = $numfaces;
681 $self->{face_prefetch} = [1 .. $numfaces];
682 $self->face_prefetch;
683}
684
685sub face_prefetch {
686 my ($self) = @_;
687
688 return unless $::CFG->{face_prefetch};
689
690 if ($self->{num_faces}) {
691 return if @{ $self->{send_queue} || [] };
692 my $todo = @{ $self->{face_prefetch} }
693 or return;
694
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696
697 $self->send ("requestinfo image_sums $face $face");
698
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info");
703
704 $self->{num_faces} = 0;
705
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 }
709}
710
711sub update_floorbox { 1164sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1165 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 1166 return unless $::CONN;
714 1167
715 $::FLOORBOX->clear; 1168 $::FLOORBOX->clear;
716 1169
1170 my @add;
1171
717 my $row; 1172 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1173 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1174 next if $_->{tag} & 0x80000000;
719 if ($row < 6) { 1175 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 1176 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 1177 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 1178 DC::Item::update_widgets $_;
723 1179
1180 push @add,
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1181 0, $row, $_->{face_widget},
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1182 1, $row, $_->{desc_widget};
726 1183
727 $row++; 1184 $row++;
728 } else { 1185 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 1186 push @add, 1, $row, new DC::UI::Button
730 text => "More...", 1187 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1188 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 1189 ;
733 last; 1190 last;
734 } 1191 }
735 } 1192 }
736 if ($::CONN->{open_container}) { 1193 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 1194 push @add, 1, $row++, new DC::UI::Button
738 text => "Close container", 1195 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1196 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 1197 ;
741 } 1198 }
1199
1200 $::FLOORBOX->add_at (@add);
742 }); 1201 });
743 1202
744 $::WANT_REFRESH++; 1203 $::WANT_REFRESH = 1;
745} 1204}
746 1205
747sub set_opencont { 1206sub set_opencont {
748 my ($conn, $tag, $name) = @_; 1207 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 1208 $conn->{open_container} = $tag;
750 update_floorbox; 1209 update_floorbox;
751 1210
752 $::INV_RIGHT_HB->clear (); 1211 $::INVR_HB->clear;
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 1212 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
754 1213
755 if ($tag != 0) { # Floor isn't closable, is it? 1214 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 1215 $::INVR_HB->add (new DC::UI::Button
757 text => "Close container", 1216 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 1217 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 1218 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1219 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 1220 if $tag != 0;
762 #if $CONN->{open_container} != 0;
763 0 1221 0
764 }, 1222 },
765 ); 1223 );
766 } 1224 }
767 1225
… …
769} 1227}
770 1228
771sub update_containers { 1229sub update_containers {
772 my ($self) = @_; 1230 my ($self) = @_;
773 1231
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1232 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 1233 my $todo = delete $self->{update_container}
776 or return; 1234 or return;
777 1235
778 for my $tag (keys %$todo) { 1236 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1237 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
814} 1272}
815 1273
816sub item_update { 1274sub item_update {
817 my ($self, $item) = @_; 1275 my ($self, $item) = @_;
818 1276
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1277 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
820 1278
821 CFClient::Item::update_widgets $item; 1279 DC::Item::update_widgets $item;
822 1280
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 1282 set_opencont ($::CONN, 0, "Floor");
825 1283
826 } elsif ($item->{flags} & F_OPEN) { 1284 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
828 1286
829 } else { 1287 } else {
830 $self->{update_container}{$item->{container}}++; 1288 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 1289 $self->update_containers;
832 } 1290 }
833} 1291}
834 1292
835sub player_update { 1293sub player_update {
836 my ($self, $player) = @_; 1294 my ($self, $player) = @_;
1295
1296 $self->update_weight;
1297}
1298
1299sub update_weight {
1300 my ($self) = @_;
1301
1302 my $weight = .001 * $self->{player}{weight};
1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1304
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1306 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 1308}
839 1309
840sub update_server_info { 1310sub update_server_info {
841 my ($self) = @_; 1311 my ($self) = @_;
842 1312
843 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1313 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
844 1314
1315 my $version = JSON::XS->new->encode ($self->{s_version});
1316
845 $::SERVER_INFO->set_markup ( 1317 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 1318 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 1319 . "protocol version <tt>$version</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1320 . "editing support $yesno[!!$self->{editor_support}]\n"
849 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1321 . "client support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1322 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 1323 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 1324 );
1325
854} 1326}
855 1327
856sub logged_in { 1328sub logged_in {
857 my ($self) = @_; 1329 my ($self) = @_;
858 1330
859 $self->send_ext_req (cfplus_support => "1", sub { 1331 $self->send_ext_req (cfplus_support => version => 2, sub {
1332 my (%msg) = @_;
1333
860 $self->{cfplus_ext} = $_[0]; 1334 $self->{cfplus_ext} = $msg{version};
861 $self->update_server_info; 1335 $self->update_server_info;
1336
1337 if ($self->{cfplus_ext} >= 2) {
1338 $self->send_ext_req ("editor_support", sub {
1339 $self->{editor_support} = { @_ };
1340 $self->update_server_info;
1341
1342 0
1343 });
1344 }
1345
1346 0
862 }); 1347 });
863 1348
864 $self->update_server_info; 1349 $self->update_server_info;
865 1350
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 1351 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
867 $self->send_command ("output-count $::CFG->{output_count}");
868 $self->send_command ("pickup $::CFG->{pickup}"); 1352 $self->send_pickup ($::CFG->{pickup});
869} 1353}
870 1354
871sub lookat { 1355sub lookat {
872 my ($self, $x, $y) = @_; 1356 my ($self, $x, $y) = @_;
873 1357
874 if ($self->{cfplus_ext}) { 1358 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 1359 $self->send_ext_req (lookat => $x, $y, sub {
876 my %res = split /\x00/, $_[0]; 1360 my (%msg) = @_;
877 1361
878 if (exists $res{npc_dialog}) { 1362 if (exists $msg{npc_dialog}) {
879 # start npc chat dialog 1363 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 1364 $self->{w}{npc_dialog} = new DC::NPCDialog::
881 dx => $x, 1365 token => $msg{npc_dialog},
882 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 1366 title => "$msg{npc_dialog}[0] (NPC)",
884 conn => $self, 1367 conn => $self,
885 ; 1368 ;
886 } 1369 }
887 }); 1370 });
888 } 1371 }
… …
891} 1374}
892 1375
893sub destroy { 1376sub destroy {
894 my ($self) = @_; 1377 my ($self) = @_;
895 1378
896 $self->{npc_dialog}->destroy 1379 $_->destroy
897 if $self->{npc_dialog}; 1380 for values %{ $self->{w} };
898 1381
899 $self->SUPER::destroy; 1382 $self->SUPER::destroy;
900}
901 1383
1384 %$self = ();
1385}
1386
902package CFClient::NPCDialog; 1387package DC::NPCDialog;
903 1388
904our @ISA = 'CFClient::UI::FancyFrame'; 1389our @ISA = 'DC::UI::Toplevel';
905 1390
906sub new { 1391sub new {
907 my $class = shift; 1392 my $class = shift;
908 1393
909 my $self = $class->SUPER::new ( 1394 my $self = $class->SUPER::new (
… …
912 name => "npc_dialog", 1397 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 1398 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 1399 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 1400 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 1401 kw => { hi => 0, yes => 0, no => 0 },
1402 has_close_button => 1,
917 @_, 1403 @_,
918 ); 1404 );
919 1405
920 Scalar::Util::weaken (my $this = $self); 1406 DC::weaken (my $this = $self);
1407
1408 $self->connect (delete => sub { $this->destroy; 1 });
921 1409
922 # better use a pane... 1410 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 1411 $self->add (my $hbox = new DC::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1412 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
925 1413
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 1414 $hbox->add (my $vbox = new DC::UI::VBox);
927 1415
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1416 $vbox->add (new DC::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1417 $vbox->add ($self->{entry} = new DC::UI::Entry
930 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1418 tooltip => "#npc_message_entry",
931 . "Sometimes you have to tell an NPC something you cannot find out during "
932 . "a normal conversation (such as a password). In those cases you have to use "
933 . "this text entry. You can also enter responses manually instead of using the response "
934 . "buttons below.",
935 on_activate => sub { 1419 on_activate => sub {
936 my ($entry, $text) = @_; 1420 my ($entry, $text) = @_;
937 1421
938 return unless $text =~ /\S/; 1422 return unless $text =~ /\S/;
939 1423
… …
942 1426
943 0 1427 0
944 }, 1428 },
945 ); 1429 );
946 1430
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1431 $vbox->add ($self->{options} = new DC::UI::VBox);
948 1432
949 $self->{bye_button} = new CFClient::UI::Button 1433 $self->{bye_button} = new DC::UI::Button
950 text => "Bye (close)", 1434 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1435 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 1436 on_activate => sub { $this->destroy; 1 },
953 ; 1437 ;
954 1438
955 $self->update_options; 1439 $self->update_options;
956 1440
957 $self->{token} = $self->{conn}->ext_token; 1441 $self->{id} = "npc-channel-" . $self->{conn}->token;
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1442 $self->{conn}->connect_ext ($self->{id} => sub {
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1443 $this->feed (@_) if $this;
1444 });
1445
1446 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
960 1447
961 $self->{entry}->grab_focus; 1448 $self->{entry}->grab_focus;
962 1449
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1450 $self->{textview}->add_paragraph ({
1451 fg => [1, 1, 0, 1],
1452 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1453 });
964 1454
965 $self->show; 1455 $self->show;
966 $self 1456 $self
967}; 1457};
968 1458
969sub update_options { 1459sub update_options {
970 my ($self) = @_; 1460 my ($self) = @_;
971 1461
972 Scalar::Util::weaken $self; 1462 DC::weaken $self;
973 1463
974 $self->{options}->clear; 1464 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1465 $self->{options}->add ($self->{bye_button});
976 1466
977 for my $kw (sort keys %{ $self->{kw} }) { 1467 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1468 $self->{options}->add (new DC::UI::Button
979 text => $kw, 1469 text => $kw,
980 on_activate => sub { 1470 on_activate => sub {
981 $self->send ($kw); 1471 $self->send ($kw);
982 0 1472 0
983 }, 1473 },
984 ); 1474 );
985 } 1475 }
986} 1476}
987 1477
988sub feed { 1478sub feed {
989 my ($self, $data) = @_; 1479 my ($self, $type, @arg) = @_;
990 1480
991 Scalar::Util::weaken $self; 1481 DC::weaken $self;
992 1482
993 my ($type, $msg) = split / /, $data, 2;
994
995 if ($type eq "msg") { 1483 if ($type eq "update") {
996 my ($msg, @kw) = split /\x00/, $msg; 1484 my (%info) = @arg;
997 1485
998 utf8::decode $_ for ($msg, @kw); 1486 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1487 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
999 1488
1000 $self->{kw}{$_} = 1 for @kw; 1489 if (exists $info{msg}) {
1001 1490 my $text = "\n" . DC::sanitise_cfxml $info{msg};
1002 $msg = "\n" . CFClient::UI::Label::escape $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1491 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1492 my @link;
1005 $msg =~ s{ 1493 $text =~ s{
1006 ($match) 1494 ($match)
1007 }{ 1495 }{
1008 my $kw = $1; 1496 my $kw = $1;
1009 1497
1010 push @link, new CFClient::UI::Label 1498 push @link, new DC::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1499 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1500 can_hover => 1,
1013 can_events => 1, 1501 can_events => 1,
1014 padding_x => 0, 1502 padding_x => 0,
1015 padding_y => 0, 1503 padding_y => 0,
1016 on_button_up => sub { 1504 on_button_up => sub {
1017 $self->send ($kw); 1505 $self->send ($kw);
1018 }; 1506 };
1019 1507
1020 chr 0xfffc 1508 "\x{fffc}"
1021 }giex; 1509 }giex;
1022 1510
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1511 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1512 $self->{textview}->scroll_to_bottom;
1513 }
1514
1025 $self->update_options; 1515 $self->update_options;
1026 } else { 1516 } else {
1027 $self->destroy; 1517 $self->destroy;
1028 } 1518 }
1029 1519
… …
1031} 1521}
1032 1522
1033sub send { 1523sub send {
1034 my ($self, $msg) = @_; 1524 my ($self, $msg) = @_;
1035 1525
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1526 $self->{textview}->add_paragraph ({
1527 markup =>
1528 "\n<span foreground='#ffff00'><b>"
1529 . (DC::asxml $msg)
1530 . "</b></span>"
1531 });
1037 $self->{textview}->scroll_to_bottom; 1532 $self->{textview}->scroll_to_bottom;
1038 1533
1039 utf8::encode $msg;
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1534 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1041} 1535}
1042 1536
1043sub destroy { 1537sub destroy {
1044 my ($self) = @_; 1538 my ($self) = @_;
1045 1539
1046 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1540 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1047 1541
1542 if ($self->{conn}) {
1048 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1543 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1049 delete $self->{conn}{npc_dialog}; 1544 delete $self->{conn}{w}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1545 $self->{conn}->disconnect_ext ($self->{id});
1546 }
1051 1547
1052 $self->SUPER::destroy; 1548 $self->SUPER::destroy;
1053} 1549}
1054 1550
10551; 15511
1552

Diff Legend

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