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

Diff Legend

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