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.136 by elmex, Fri Jul 27 18:04:42 2007 UTC vs.
Revision 1.214 by root, Tue Dec 22 00:35:44 2009 UTC

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

Diff Legend

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