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.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.203 by elmex, Sun Sep 21 12:34:14 2008 UTC

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

Diff Legend

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