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.78 by elmex, Mon Aug 14 14:35:31 2006 UTC vs.
Revision 1.207 by root, Sat Dec 20 19:45:50 2008 UTC

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

Diff Legend

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