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

Diff Legend

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