ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.206 by elmex, Sun Dec 7 16:20:44 2008 UTC

1	package CFPlus::Protocol;	1	package DC::Protocol;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Deliantra::Protocol::Constants;
7		7
8	use CFPlus;	8	use DC;
9	use CFPlus::DB;	9	use DC::DB;
10	use CFPlus::UI;	10	use DC::UI;
11	use CFPlus::Pod;	11	use DC::Pod;
12	use CFPlus::Macro;	12	use DC::Macro;
13	use CFPlus::Item;	13	use DC::Item;
14		14
15	use Crossfire::Protocol::Base 0.95;
16
17	use base 'Crossfire::Protocol::Base';	15	use base 'Deliantra::Protocol::Base';
		16
		17	our $TEX_DIALOGUE = new_from_resource DC::Texture
		18	"dialogue.png", minify => 1, mipmap => 1;
		19
		20	our $TEX_NOFACE = new_from_resource DC::Texture
		21	"noface.png", minify => 1, mipmap => 1;
		22
		23	sub MIN_TEXTURE_UNUSED() { 1 }#d#
18		24
19	sub new {	25	sub 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,
		32	widget => 2,
26	%{$arg{setup_req} || {}},	33	%{$arg{setup_req} || {}},
27	},	34	},
28	);	35	);
29		36
30	$self->{map_widget}->clr_commands;	37	$self->{map_widget}->clr_commands;
31		38
32	my @cmd_help = map {	39	my @cmd_help = map {
33	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	40	$_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
34	or die "unparseable command help: $_->{kw}[0]";	41	or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
35		42
36	my $cmd = $1;	43	my $cmd = $1;
37	my @args = split /\|/, $2;	44	my @args = split /\|/, $2;
38	@args = (".*") unless @args;	45	@args = (".*") unless @args;
39		46
40	my (undef, @par) = CFPlus::Pod::section_of $_;	47	my (undef, @par) = DC::Pod::section_of $_;
41	my $text = CFPlus::Pod::as_label @par;	48	my $text = DC::Pod::as_label @par;
42		49
43	$_ = $_ eq ".*" ? "" : " $_"	50	$_ = $_ eq ".*" ? "" : " $_"
44	for @args;	51	for @args;
45		52
46	map ["$cmd$_", $text],	53	map ["$cmd$_", $text],
47	sort { (length $a) <=> (length $b) }	54	sort { (length $a) <=> (length $b) }
48	@args	55	@args
49	} sort { $a->{par} <=> $b->{par} }	56	} sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
50	CFPlus::Pod::find command => "*";	57	DC::Pod::find command => "*";
51		58
52	$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 {
53	my ($cap) = @_;	65	my ($id) = @_;
54		66	sub {
55	if (my $ts = $cap->{tileset}) {	67	$self->send_exti_msg (w_e => $id, @_);
56	if (my ($default) = grep $_->[2] & 1, @$ts) {
57	$self->{tileset} = $default;
58	$self->{tilesize} = $default->[3];
59	$self->setup_req (tileset => $default->[0]);
60
61	my $w = int $self->{mapw} * 32 / $self->{tilesize};
62	my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64	$self->setup_req (mapsize => "${w}x${h}");
65	}	68	}
66	}	69	});
		70
		71	# destroy widgets on logout
		72	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		73	for my $ws (values %{delete $self->{widgetset} || {}}) {
		74	$_->destroy
		75	for values %{delete $ws->{w} || {}};
		76	}
		77
		78	delete $self->{items};
		79	$::INV->clear;
		80	$::INVR->clear;
		81	$::INVR_HB->clear;
		82	$::FLOORBOX->clear;
67	});	83	});
68		84
69	$self->{map_widget}->add_command (@$_)	85	$self->{map_widget}->add_command (@$_)
70	for @cmd_help;	86	for @cmd_help;
71		87
72	{	88	{
73	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	89	$self->{dialogue} = my $tex = $TEX_DIALOGUE;
74	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
75	$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}});
76	}	91	}
77		92
78	{	93	{
79	$self->{noface} = my $tex = new_from_file CFPlus::Texture	94	$self->{noface} = my $tex = $TEX_NOFACE;
80	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81	$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}});
82	}	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	# };
83		112
84	$self->{open_container} = 0;	113	$self->{open_container} = 0;
85		114
86	# per server	115	# per server
87	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	116	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88		117
89	$self	118	$self
90	}	119	}
91		120
		121	sub 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
		131	sub 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
		163	sub ext_ambient_music {
		164	my ($self, $songs) = @_;
		165	&::audio_music_set_ambient ($songs);
		166	}
		167
		168	#############################################################################
		169
		170	sub 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
		193	sub ext_ws_n {
		194	my ($self, $id) = @_;
		195
		196	$self->{widgetset}{$id} = {
		197	w => {},
		198	};
		199	}
		200
		201	# widgetset destroy
		202	sub 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
		213	sub 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
		225	sub 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
		273	sub 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
		321	sub 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
		335	sub 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
		353	sub 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
		363	sub ext_channel_info {
		364	my ($self, $info) = @_;
		365	$self->{channels}->{$info->{id}} = $info;
		366	$::MESSAGE_DIST->add_channel ($info);
		367	}
		368
		369	#############################################################################
		370
92	sub logprint {	371	sub logprint {
93	my ($self, @a) = @_;	372	my ($self, @a) = @_;
94		373
95	$self->{log_fh} ||= do {	374	DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96	my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98	open my $fh, ">>:utf8", $path
99	or die "Couldn't open logfile $path: $!";
100
101	$fh->autoflush (1);
102
103	$fh;
104	};
105
106	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111	print {$self->{log_fh}} "$ts ", @a, "\n";
112	}	375	}
113		376
114	sub _stat_numdiff {	377	sub _stat_numdiff {
115	my ($self, $name, $old, $new) = @_;	378	my ($self, $name, $old, $new) = @_;
116		379
…		…
200		463
201	if (	464	if (
202	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	465	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
203	) {	466	) {
204	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	467	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
205	$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);
206	}	469	}
207		470
208	$self->update_stats_window ($stats, $prev);	471	$self->update_stats_window ($stats, $prev);
209		472
210	$self->{prev_stats} = { %$stats };	473	$self->{prev_stats} = { %$stats };
…		…
249	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	512	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
250	$::GAUGES->{food} ->set_value ($fo, $fo_m);	513	$::GAUGES->{food} ->set_value ($fo, $fo_m);
251	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	514	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
252	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	515	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	516	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254	my $rng = $stats->{+CS_STAT_RANGE};	517	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
255	$rng =~ s/^Range: //; # thank you so much dear server	518	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
256	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
257	my $title = $stats->{+CS_STAT_TITLE};	519	my $title = $stats->{+CS_STAT_TITLE};
258	$title =~ s/^Player: //;	520	$title =~ s/^Player: //;
259	$::STATWIDS->{title} ->set_text ("Title: " . $title);	521	$::STATWIDS->{title} ->set_text ("Title: " . $title);
260		522
261	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	523	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
278	for keys %RES_TBL;	540	for keys %RES_TBL;
279		541
280	my $sktbl = $::STATWIDS->{skill_tbl};	542	my $sktbl = $::STATWIDS->{skill_tbl};
281	my @skills = keys %{ $self->{skill_info} };	543	my @skills = keys %{ $self->{skill_info} };
282		544
283	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
284	$sktbl->clear;	553	$sktbl->clear;
285		554
		555	my $sw = $self->{skillwid}{""} ||= [
286	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	556	0, 0, (new DC::UI::Label text => "Experience", align => 1),
287	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	557	1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
288	$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),
289	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	560	4, 0, (new DC::UI::Label text => "Experience", align => 1),
290	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	561	5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
291	$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	];
292		565
		566	my @add = @$sw;
		567
293	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>";
294		569
295	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);
296	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);
297		572
298	my ($x, $y) = (0, 1);	573	my ($x, $y) = (0, 1);
299	for (	574	for (@order) {
300	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
301	map [$_, $self->{skill_info}{$_}],
302	grep exists $stats->{$_},
303	@skills
304	) {
305	my ($idx, $name) = @$_;	575	my ($idx, $name) = @$_;
306		576
307	my $spell_cb = sub {	577	my $spell_cb = sub {
308	my ($widget, $ev) = @_;	578	my ($widget, $ev) = @_;
309		579
310	if ($ev->{button} == 1) {	580	if ($ev->{button} == 1) {
311	$::CONN->user_send ("ready_skill $name");	581	$::CONN->user_send ("ready_skill $name");
312	} elsif ($ev->{button} == 2) {	582	} elsif ($ev->{button} == 2) {
313	$::CONN->user_send ("use_skill $name");	583	$::CONN->user_send ("use_skill $name");
314	} elsif ($ev->{button} == 3) {	584	} elsif ($ev->{button} == 3) {
315	my $shortname = CFPlus::shorten $name, 14;	585	my $shortname = DC::shorten $name, 14;
316	(new CFPlus::UI::Menu	586	(new DC::UI::Menu
317	items => [	587	items => [
318	["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"] }],
319	["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"] }],
320	],	590	],
321	)->popup ($ev);	591	)->popup ($ev);
322	} else {	592	} else {
323	return 0;	593	return 0;
324	}	594	}
325		595
326	1	596	1
327	};	597	};
328		598
329	$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
330	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),
331	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	603
		604	# level
		605	(new DC::UI::Label
332	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
333	$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,
334	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	;
335		622
336	$x++ and ($x, $y) = (0, $y + 1);	623	$x++ and ($x, $y) = (0, $y + 1);
337	}	624	}
338	}
339		625
340	for (grep exists $stats->{$_}, @skills) {	626	$sktbl->add_at (@add);
341	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
342	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
343	}	627	}
344	}
345		628
346	sub macro_send {	629	for (@order) {
347	my ($self, $macro) = @_;	630	my ($idx, $name) = @$_;
		631	my $val = $stats->{$idx};
348		632
349	for my $cmd (@{ $macro->{action} }) {	633	next if $prev->{$idx}[1] eq $val->[1];
350	$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);
351	}	642	}
352	}	643	}
353		644
354	sub user_send {	645	sub user_send {
355	my ($self, $command) = @_;	646	my ($self, $command) = @_;
…		…
357	$self->{record}->($command)	648	$self->{record}->($command)
358	if $self->{record};	649	if $self->{record};
359		650
360	$self->logprint ("send: ", $command);	651	$self->logprint ("send: ", $command);
361	$self->send_command ($command);	652	$self->send_command ($command);
362	::status ($command);
363	}	653	}
364		654
365	sub record {	655	sub record {
366	my ($self, $cb) = @_;	656	my ($self, $cb) = @_;
367		657
…		…
369	}	659	}
370		660
371	sub map_scroll {	661	sub map_scroll {
372	my ($self, $dx, $dy) = @_;	662	my ($self, $dx, $dy) = @_;
373		663
374	$self->{map}->scroll ($dx, $dy);	664	$self->{map_widget}->scroll ($dx, $dy);
375	}	665	}
376		666
377	sub feed_map1a {	667	sub feed_map1a {
378	my ($self, $data) = @_;	668	my ($self, $data) = @_;
379		669
380	$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 {
381	$self->{map_widget}->update;	698	$self->{map_widget}->update;
		699	}
382	}	700	}
383		701
384	sub magicmap {	702	sub magicmap {
385	my ($self, $w, $h, $x, $y, $data) = @_;	703	my ($self, $w, $h, $x, $y, $data) = @_;
386		704
…		…
388	}	706	}
389		707
390	sub flush_map {	708	sub flush_map {
391	my ($self) = @_;	709	my ($self) = @_;
392		710
393	my $map_info = delete $self->{map_info}	711	return unless $self->{map_info};
394	or return;
395		712
		713	for my $map_info (values %{ $self->{map_cache} || {} }) {
396	my ($hash, $x, $y, $w, $h) = @$map_info;	714	my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
397		715
398	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;
399	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	721	DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
400	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	722	}
		723	}
401	}	724	}
402		725
403	sub map_clear {	726	sub map_clear {
404	my ($self) = @_;	727	my ($self) = @_;
405		728
406	$self->flush_map;	729	$self->flush_map;
		730	delete $self->{map_info};
407	delete $self->{neigh_map};	731	delete $self->{neigh_map};
408		732
409	$self->{map}->clear;	733	$self->{map}->clear;
410	delete $self->{map_widget}{magicmap};	734	delete $self->{map_widget}{magicmap};
411	}	735	}
412		736
413	sub bg_fetch {	737	sub bg_fetch {
414	my ($self) = @_;	738	my ($self) = @_;
415		739
416	my $id;	740	my $tile;
417		741
418	do {	742	do {
419	$id = pop @{$self->{bg_fetch}}	743	$tile = pop @{$self->{bg_fetch}}
420	or return;	744	or return;
421	} while $self->{texture}[$id];	745	} while $self->{texture}[$tile];
422		746
423	CFPlus::DB::get tilecache => $id, sub {	747	DC::DB::get tilecache => $tile, sub {
424	my ($data) = @_;	748	my ($data) = @_;
425		749
426	return unless $self->{map}; # stop when destroyed	750	return unless $self->{map}; # stop when destroyed
427		751
428	$self->set_texture ($id => $data)
429	if defined $data;	752	if (defined $data) {
		753	$self->have_tile ($tile, $data);
		754	$self->{texture}[$tile]->upload;
		755	}
430		756
431	$self->bg_fetch;	757	$self->bg_fetch;
432	};	758	};
433	}	759	}
434		760
435	sub load_map($$$) {	761	sub load_map($$$$$$) {
436	my ($self, $hash, $x, $y) = @_;	762	my ($self, $hash, $x, $y, $w, $h) = @_;
437		763
438	my $gen = $self->{map_change_gen};	764	my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
439		765
440	CFPlus::DB::get $self->{mapcache} => $hash, sub {	766	my $cb = sub {
441	return unless $gen == $self->{map_change_gen};	767	$map_info->[1] = \$_[0];
442		768
443	my ($data) = @_;
444
445	if (defined $data) {
446	$data = Compress::LZF::decompress $data;
447	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
448
449	my $inprogress = @{ $self->{bg_fetch} || [] };	769	my $inprogress = @{ $self->{bg_fetch} || [] };
450	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	770	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
451	$self->bg_fetch unless $inprogress;	771	$self->bg_fetch unless $inprogress;
452	}
453	};	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	}
454	}	785	}
455		786
456	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	787	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
457	# (server resource,s latency, bandwidth), so this hack is warranted.	788	# (server resources, latency, bandwidth), so this hack is warranted.
458	# 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
459	sub send_mapinfo {	790	sub send_mapinfo {
460	my ($self, $data, $cb) = @_;	791	my ($self, $data, $cb) = @_;
461		792
462	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)$%) {
…		…
487	}	818	}
488		819
489	# this method does a "flood fill" into every tile direction	820	# this method does a "flood fill" into every tile direction
490	# it assumes that tiles are arranged in a rectangular grid,	821	# it assumes that tiles are arranged in a rectangular grid,
491	# 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.
492	# failure to comply are harmless and result in display errors	823	# failure to comply is harmless and results in display errors
493	# at worst.	824	# at worst.
494	sub flood_fill {	825	sub flood_fill {
495	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;	826	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
496		827
497	# the server does not allow map paths > 6	828	# the server does not allow map paths > 6
…		…
533	return if $mode ne "spatial";	864	return if $mode ne "spatial";
534		865
535	$x += $self->{map}->ox;	866	$x += $self->{map}->ox;
536	$y += $self->{map}->oy;	867	$y += $self->{map}->oy;
537		868
538	$self->load_map ($hash, $x, $y)	869	$self->load_map ($hash, $x, $y, $w, $h)
539	unless $self->{neigh_map}{$hash}[5]++;#d#	870	unless $self->{neigh_map}{$hash}[5]++;#d#
540		871
541	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];	872	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
542		873
543	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	874	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
…		…
551	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	882	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
552		883
553	$self->flush_map;	884	$self->flush_map;
554		885
555	++$self->{map_change_gen};	886	++$self->{map_change_gen};
		887	$self->{map_cache_old} = delete $self->{map_cache};
556		888
557	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	889	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
558		890
559	my $mapmapw = $self->{mapmap}->{w};	891	my $mapmapw = $self->{mapmap}->{w};
560	my $mapmaph = $self->{mapmap}->{h};	892	my $mapmaph = $self->{mapmap}->{h};
…		…
572	$self->{map_info} = [$hash, $x, $y, $w, $h];	904	$self->{map_info} = [$hash, $x, $y, $w, $h];
573		905
574	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;	906	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
575	$::STATWIDS->{map}->set_text ("Map: " . $map);	907	$::STATWIDS->{map}->set_text ("Map: " . $map);
576		908
577	$self->load_map ($hash, $x, $y);	909	$self->load_map ($hash, $x, $y, $w, $h);
578	$self->flood_fill (0, 0, 0, "", $hash, $flags);	910	$self->flood_fill (0, 0, 0, "", $hash, $flags);
579	}	911	}
580		912
581	sub face_find {	913	sub face_find {
582	my ($self, $facenum, $face, $cb) = @_;	914	my ($self, $facenum, $face, $cb) = @_;
583		915
584	my $hash = "$face->{chksum},$face->{name}";	916	if ($face->{type} == 0) { # FT_FACE
585
586	my $id = CFPlus::DB::get_tile_id_sync $hash;	917	my $id = DC::DB::get_tile_id_sync $face->{name};
587		918
588	$face->{id} = $id;	919	$face->{id} = $id;
589	$self->{faceid}[$facenum] = $id;
590
591	$self->{map}->set_tileid ($facenum => $id);	920	$self->{map}->set_tileid ($facenum => $id);
592		921
593	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	}
594	}	930	}
595		931
596	sub face_update {	932	sub face_update {
597	my ($self, $facenum, $face, $changed) = @_;	933	my ($self, $facenum, $face, $changed) = @_;
598		934
		935	if ($face->{type} == 0) {
		936	# image, FT_FACE
599	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	937	DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
600	if $changed;	938	if $changed;
601		939
602	$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	}
603	}	973	}
604		974
605	sub smooth_update {	975	sub smooth_update {
606	my ($self, $facenum, $face) = @_;	976	my ($self, $facenum, $face) = @_;
607		977
608	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	978	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609	}	979	}
610		980
611	sub set_texture {	981	sub have_tile {
612	my ($self, $id, $data) = @_;	982	my ($self, $tile, $data) = @_;
613		983
614	$self->{texture}[$id] = my $tex =	984	return unless $self->{map};
615	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,
616	$data, minify => 1, mipmap => 1;	990	minify => 1, mipmap => 1;
617		991
618	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	992	if (my $cbs = delete $self->{tile_cb}{$tile}) {
619	$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
		999	sub 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
		1015	sub 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)
620	}	1026	}
621		1027
622	sub sound_play {	1028	sub sound_play {
623	my ($self, $x, $y, $soundnum, $type) = @_;	1029	my ($self, $type, $face, $dx, $dy, $vol) = @_;
624		1030
625	$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
626	}	1033	}
627		1034
628	my $LAST_QUERY; # server is stupid, stupid, stupid	1035	my $LAST_QUERY; # server is stupid, stupid, stupid
629		1036
630	sub query {	1037	sub query {
…		…
633	$prompt = $LAST_QUERY unless length $prompt;	1040	$prompt = $LAST_QUERY unless length $prompt;
634	$LAST_QUERY = $prompt;	1041	$LAST_QUERY = $prompt;
635		1042
636	$self->{query}-> ($self, $flags, $prompt);	1043	$self->{query}-> ($self, $flags, $prompt);
637	}	1044	}
		1045
		1046	sub sanitise_xml($) {
		1047	local $_ = shift;
		1048
		1049	# we now weed out all tags we do not support
		1050	s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
		1051	}{
		1052	"&lt;"
		1053	}gex;
		1054
		1055	# now all entities
		1056	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
		1057
		1058	# handle some elements
		1059	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+$//;
		1063
		1064	$_
		1065	}
		1066
		1067	our %NAME_TO_COLOR = (
		1068	black => 0,
		1069	white => 1,
		1070	darkblue => 2,
		1071	red => 3,
		1072	orange => 4,
		1073	lightblue => 5,
		1074	darkorange => 6,
		1075	green => 7,
		1076	darkgreen => 8,
		1077	grey => 9,
		1078	brown => 10,
		1079	yellow => 11,
		1080	tan => 12,
		1081	);
638		1082
639	our @CF_COLOR = (	1083	our @CF_COLOR = (
640	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	1084	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641	[1.00, 1.00, 1.00],	1085	[1.00, 1.00, 1.00],
642	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	1086	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
…		…
650	[0.75, 0.61, 0.20],	1094	[0.75, 0.61, 0.20],
651	[0.99, 0.77, 0.26],	1095	[0.99, 0.77, 0.26],
652	[0.74, 0.65, 0.41],	1096	[0.74, 0.65, 0.41],
653	);	1097	);
654		1098
655	sub drawinfo {	1099	sub msg {
656	my ($self, $color, $text) = @_;	1100	my ($self, $color, $type, $text, @extra) = @_;
657		1101
658	my $fg = $CF_COLOR[$color % @CF_COLOR];	1102	$text = sanitise_xml $text;
659		1103
		1104	if (my $cb = $self->{cb_msg}{$type}) {
		1105	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1106	} elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
		1107	$type =~ s/-/_/g;
		1108	$self->{$type} = $text;
		1109	} else {
660	$self->logprint ("info: ", $text);	1110	$self->logprint ("msg: ", $text);
		1111	return if $color < 0; # negative color == ignore if not understood
661		1112
		1113	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
		1114
662	## 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
663	# no longer neecssary with TRT servers	1116	# no longer neecssary with TRT servers
664	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1117	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
665		1118
666	$text = CFPlus::asxml $text;	1119	::message ({
667	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1120	fg => $fg,
668	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	1121	markup => $text,
		1122	type => $type,
		1123	extra => [@extra],
		1124	color_flags => $color, #d# ugly, kill
		1125	});
669		1126
670	::message ({ fg => $fg, markup => $_ })	1127	# $color &= ~NDI_CLEAR; # only clear once for multiline messages
671	for split /\n/, $text;	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.
672		1132
673	$self->{statusbox}->add ($text,	1133	$self->{statusbox}->add ($text,
674	group => $text,	1134	group => $text,
675	fg => $fg,	1135	fg => $fg,
676	timeout => $color >= 2 ? 180 : 10,	1136	timeout => $color >= 2 ? 180 : 10,
677	tooltip_font => $::FONT_FIXED,	1137	tooltip_font => $::FONT_FIXED,
678	);	1138	) if $type eq "info";
679	}	1139	}
680
681	sub drawextinfo {
682	my ($self, $color, $type, $subtype, $message) = @_;
683
684	$self->drawinfo ($color, $message);
685	}	1140	}
686		1141
687	sub spell_add {	1142	sub spell_add {
688	my ($self, $spell) = @_;	1143	my ($self, $spell) = @_;
689		1144
…		…
692	$spell->{message} =~ s/\n+$//;	1147	$spell->{message} =~ s/\n+$//;
693	$spell->{message} ||= "Server did not provide a description for this spell.";	1148	$spell->{message} ||= "Server did not provide a description for this spell.";
694		1149
695	$::SPELL_LIST->add_spell ($spell);	1150	$::SPELL_LIST->add_spell ($spell);
696		1151
697	$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});
698	$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});
699	}	1154	}
700		1155
701	sub spell_delete {	1156	sub spell_delete {
702	my ($self, $spell) = @_;	1157	my ($self, $spell) = @_;
703		1158
…		…
714	sub addme_success {	1169	sub addme_success {
715	my ($self) = @_;	1170	my ($self) = @_;
716		1171
717	my %skill_help;	1172	my %skill_help;
718		1173
719	for my $node (CFPlus::Pod::find skill_description => "*") {	1174	for my $node (DC::Pod::find skill_description => "*") {
720	my (undef, @par) = CFPlus::Pod::section_of $node;	1175	my (undef, @par) = DC::Pod::section_of $node;
721	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;	1176	$skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
722	};	1177	};
723		1178
724	for my $skill (values %{$self->{skill_info}}) {	1179	for my $skill (values %{$self->{skill_info}}) {
725	$self->{map_widget}->add_command ("ready_skill $skill",	1180	$self->{map_widget}->add_command ("ready_skill $skill",
726	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1181	(DC::asxml "Ready the skill '$skill'\n\n")
727	. $skill_help{$skill});	1182	. $skill_help{$skill});
728	$self->{map_widget}->add_command ("use_skill $skill",	1183	$self->{map_widget}->add_command ("use_skill $skill",
729	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1184	(DC::asxml "Immediately use the skill '$skill'\n\n")
730	. $skill_help{$skill});	1185	. $skill_help{$skill});
731	}	1186	}
732	}	1187	}
733		1188
734	sub eof {	1189	sub eof {
…		…
737	$self->{map_widget}->clr_commands;	1192	$self->{map_widget}->clr_commands;
738		1193
739	::stop_game ();	1194	::stop_game ();
740	}	1195	}
741		1196
742	sub image_info {
743	my ($self, $numfaces) = @_;
744
745	$self->{num_faces} = $numfaces;
746	$self->{face_prefetch} = [1 .. $numfaces];
747	$self->face_prefetch;
748	}
749
750	sub face_prefetch {
751	my ($self) = @_;
752
753	return unless $::CFG->{face_prefetch};
754
755	if ($self->{num_faces}) {
756	return if @{ $self->{send_queue} || [] };
757	my $todo = @{ $self->{face_prefetch} }
758	or return;
759
760	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
761
762	$self->send ("requestinfo image_sums $face $face");
763
764	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
765	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
766	} elsif (!exists $self->{num_faces}) {
767	$self->send ("requestinfo image_info");
768
769	$self->{num_faces} = 0;
770
771	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
772	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
773	}
774	}
775
776	sub update_floorbox {	1197	sub update_floorbox {
777	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1198	$DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
778	return unless $::CONN;	1199	return unless $::CONN;
779		1200
780	$::FLOORBOX->clear;	1201	$::FLOORBOX->clear;
781		1202
		1203	my @add;
		1204
782	my $row;	1205	my $row;
783	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;
784	if ($row < 6) {	1208	if ($row < 6) {
785	local $_->{face_widget}; # hack to force recreation of widget	1209	local $_->{face_widget}; # hack to force recreation of widget
786	local $_->{desc_widget}; # hack to force recreation of widget	1210	local $_->{desc_widget}; # hack to force recreation of widget
787	CFPlus::Item::update_widgets $_;	1211	DC::Item::update_widgets $_;
788		1212
		1213	push @add,
789	$::FLOORBOX->add (0, $row, $_->{face_widget});	1214	0, $row, $_->{face_widget},
790	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1215	1, $row, $_->{desc_widget};
791		1216
792	$row++;	1217	$row++;
793	} else {	1218	} else {
794	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1219	push @add, 1, $row, new DC::UI::Button
795	text => "More...",	1220	text => "More...",
796	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1221	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
797	);	1222	;
798	last;	1223	last;
799	}	1224	}
800	}	1225	}
801	if ($::CONN->{open_container}) {	1226	if ($::CONN->{open_container}) {
802	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1227	push @add, 1, $row++, new DC::UI::Button
803	text => "Close container",	1228	text => "Close container",
804	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1229	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
805	);	1230	;
806	}	1231	}
		1232
		1233	$::FLOORBOX->add_at (@add);
807	});	1234	});
808		1235
809	$::WANT_REFRESH++;	1236	$::WANT_REFRESH = 1;
810	}	1237	}
811		1238
812	sub set_opencont {	1239	sub set_opencont {
813	my ($conn, $tag, $name) = @_;	1240	my ($conn, $tag, $name) = @_;
814	$conn->{open_container} = $tag;	1241	$conn->{open_container} = $tag;
815	update_floorbox;	1242	update_floorbox;
816		1243
817	$::INV_RIGHT_HB->clear ();	1244	$::INVR_HB->clear;
818	$::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);
819		1246
820	if ($tag != 0) { # Floor isn't closable, is it?	1247	if ($tag != 0) { # Floor isn't closable, is it?
821	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1248	$::INVR_HB->add (new DC::UI::Button
822	text => "Close container",	1249	text => "Close container",
823	tooltip => "Close the currently open container (if one is open)",	1250	tooltip => "Close the currently open container (if one is open)",
824	on_activate => sub {	1251	on_activate => sub {
825	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1252	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
826	if $tag != 0;	1253	if $tag != 0;
827	#if $CONN->{open_container} != 0;
828	0	1254	0
829	},	1255	},
830	);	1256	);
831	}	1257	}
832		1258
…		…
834	}	1260	}
835		1261
836	sub update_containers {	1262	sub update_containers {
837	my ($self) = @_;	1263	my ($self) = @_;
838		1264
839	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1265	$DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
840	my $todo = delete $self->{update_container}	1266	my $todo = delete $self->{update_container}
841	or return;	1267	or return;
842		1268
843	for my $tag (keys %$todo) {	1269	for my $tag (keys %$todo) {
844	update_floorbox if $tag == 0 or $tag == $self->{open_container};	1270	update_floorbox if $tag == 0 or $tag == $self->{open_container};
…		…
879	}	1305	}
880		1306
881	sub item_update {	1307	sub item_update {
882	my ($self, $item) = @_;	1308	my ($self, $item) = @_;
883		1309
884	#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";
885		1311
886	CFPlus::Item::update_widgets $item;	1312	DC::Item::update_widgets $item;
887		1313
888	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1314	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
889	set_opencont ($::CONN, 0, "Floor");	1315	set_opencont ($::CONN, 0, "Floor");
890		1316
891	} elsif ($item->{flags} & F_OPEN) {	1317	} elsif ($item->{flags} & F_OPEN) {
892	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);	1318	set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
893		1319
894	} else {	1320	} else {
895	$self->{update_container}{$item->{container}}++;	1321	$self->{update_container}{$item->{container}}++;
896	$self->update_containers;	1322	$self->update_containers;
897	}	1323	}
…		…
908		1334
909	my $weight = .001 * $self->{player}{weight};	1335	my $weight = .001 * $self->{player}{weight};
910	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};	1336	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
911		1337
912	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);	1338	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
913	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);	1339	$::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
914	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);	1340	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
915	}	1341	}
916		1342
917	sub update_server_info {	1343	sub update_server_info {
918	my ($self) = @_;	1344	my ($self) = @_;
…		…
926	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1352	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
927	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"	1353	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
928	. "editing support $yesno[!!$self->{editor_support}]\n"	1354	. "editing support $yesno[!!$self->{editor_support}]\n"
929	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1355	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
930	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"	1356	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
931	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1357	. "client support $yesno[$self->{cfplus_ext} > 0]"
932	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1358	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
933	. "map size $self->{mapw}×$self->{maph}\n"	1359	. "map size $self->{mapw}×$self->{maph}\n"
934	);	1360	);
935		1361
936	::setup_build_button ($self->{editor_support}->{builder_ui});
937	}	1362	}
938		1363
939	sub logged_in {	1364	sub logged_in {
940	my ($self) = @_;	1365	my ($self) = @_;
941		1366
942	$self->send_ext_req (cfplus_support => version => 1, sub {	1367	$self->send_ext_req (cfplus_support => version => 2, sub {
		1368	my (%msg) = @_;
		1369
943	$self->{cfplus_ext} = $_[0]{version};	1370	$self->{cfplus_ext} = $msg{version};
944	$self->update_server_info;	1371	$self->update_server_info;
945		1372
946	if ($self->{cfplus_ext} >= 2) {	1373	if ($self->{cfplus_ext} >= 2) {
947	$self->send_ext_req ("editor_support", sub {	1374	$self->send_ext_req ("editor_support", sub {
948	$self->{editor_support} = $_[0];	1375	$self->{editor_support} = { @_ };
949	$self->update_server_info;	1376	$self->update_server_info;
950		1377
951	0	1378	0
952	});	1379	});
953	}	1380	}
…		…
955	0	1382	0
956	});	1383	});
957		1384
958	$self->update_server_info;	1385	$self->update_server_info;
959		1386
960	$self->send_command ("output-sync $::CFG->{output_sync}");
961	$self->send_command ("output-count $::CFG->{output_count}");
962	$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;
963	$self->send_command ("pickup $::CFG->{pickup}");	1388	$self->send_command ("pickup $::CFG->{pickup}");
964	}
965		1389
966	sub buildat {	1390	$self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
967	my ($self, $builditem, $x, $y) = @_;	1391	DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
968
969	if ($self->{cfplus_ext}) {
970	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
971	}
972	}	1392	}
973		1393
974	sub lookat {	1394	sub lookat {
975	my ($self, $x, $y) = @_;	1395	my ($self, $x, $y) = @_;
976		1396
977	if ($self->{cfplus_ext}) {	1397	if ($self->{cfplus_ext}) {
978	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1398	$self->send_ext_req (lookat => $x, $y, sub {
979	my ($msg) = @_;	1399	my (%msg) = @_;
980		1400
981	if (exists $msg->{npc_dialog}) {	1401	if (exists $msg{npc_dialog}) {
982	# start npc chat dialog	1402	# start npc chat dialog
983	$self->{npc_dialog} = new CFPlus::NPCDialog::	1403	$self->{npc_dialog} = new DC::NPCDialog::
984	dx => $x,	1404	token => $msg{npc_dialog},
985	dy => $y,
986	title => "$msg->{npc_dialog} (NPC)",	1405	title => "$msg{npc_dialog}[0] (NPC)",
987	conn => $self,	1406	conn => $self,
988	;	1407	;
989	}	1408	}
990	});	1409	});
991	}	1410	}
…		…
998		1417
999	(delete $self->{npc_dialog})->destroy	1418	(delete $self->{npc_dialog})->destroy
1000	if $self->{npc_dialog};	1419	if $self->{npc_dialog};
1001		1420
1002	$self->SUPER::destroy;	1421	$self->SUPER::destroy;
1003	}
1004		1422
		1423	%$self = ();
		1424	}
		1425
1005	package CFPlus::NPCDialog;	1426	package DC::NPCDialog;
1006		1427
1007	our @ISA = 'CFPlus::UI::Toplevel';	1428	our @ISA = 'DC::UI::Toplevel';
1008		1429
1009	sub new {	1430	sub new {
1010	my $class = shift;	1431	my $class = shift;
1011		1432
1012	my $self = $class->SUPER::new (	1433	my $self = $class->SUPER::new (
…		…
1019	kw => { hi => 0, yes => 0, no => 0 },	1440	kw => { hi => 0, yes => 0, no => 0 },
1020	has_close_button => 1,	1441	has_close_button => 1,
1021	@_,	1442	@_,
1022	);	1443	);
1023		1444
1024	CFPlus::weaken (my $this = $self);	1445	DC::weaken (my $this = $self);
1025		1446
1026	$self->connect (delete => sub { $this->destroy; 1 });	1447	$self->connect (delete => sub { $this->destroy; 1 });
1027		1448
1028	# better use a pane...	1449	# better use a pane...
1029	$self->add (my $hbox = new CFPlus::UI::HBox);	1450	$self->add (my $hbox = new DC::UI::HBox);
1030	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);	1451	$hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1031		1452
1032	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1453	$hbox->add (my $vbox = new DC::UI::VBox);
1033		1454
1034	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1455	$vbox->add (new DC::UI::Label text => "Message Entry:");
1035	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1456	$vbox->add ($self->{entry} = new DC::UI::Entry
1036	tooltip => "#npc_message_entry",	1457	tooltip => "#npc_message_entry",
1037	on_activate => sub {	1458	on_activate => sub {
1038	my ($entry, $text) = @_;	1459	my ($entry, $text) = @_;
1039		1460
1040	return unless $text =~ /\S/;	1461	return unless $text =~ /\S/;
…		…
1044		1465
1045	0	1466	0
1046	},	1467	},
1047	);	1468	);
1048		1469
1049	$vbox->add ($self->{options} = new CFPlus::UI::VBox);	1470	$vbox->add ($self->{options} = new DC::UI::VBox);
1050		1471
1051	$self->{bye_button} = new CFPlus::UI::Button	1472	$self->{bye_button} = new DC::UI::Button
1052	text => "Bye (close)",	1473	text => "Bye (close)",
1053	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.",
1054	on_activate => sub { $this->destroy; 1 },	1475	on_activate => sub { $this->destroy; 1 },
1055	;	1476	;
1056		1477
1057	$self->update_options;	1478	$self->update_options;
1058		1479
1059	$self->{id} = $self->{conn}->send_ext_req (	1480	$self->{id} = "npc-channel-" . $self->{conn}->token;
1060	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1481	$self->{conn}->connect_ext ($self->{id} => sub {
1061	sub { $this && $this->feed (@_) }	1482	$this->feed (@_) if $this;
1062	);	1483	});
		1484
		1485	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1063		1486
1064	$self->{entry}->grab_focus;	1487	$self->{entry}->grab_focus;
1065		1488
1066	$self->{textview}->add_paragraph ({	1489	$self->{textview}->add_paragraph ({
1067	fg => [1, 1, 0, 1],	1490	fg => [1, 1, 0, 1],
…		…
1073	};	1496	};
1074		1497
1075	sub update_options {	1498	sub update_options {
1076	my ($self) = @_;	1499	my ($self) = @_;
1077		1500
1078	CFPlus::weaken $self;	1501	DC::weaken $self;
1079		1502
1080	$self->{options}->clear;	1503	$self->{options}->clear;
1081	$self->{options}->add ($self->{bye_button});	1504	$self->{options}->add ($self->{bye_button});
1082		1505
1083	for my $kw (sort keys %{ $self->{kw} }) {	1506	for my $kw (sort keys %{ $self->{kw} }) {
1084	$self->{options}->add (new CFPlus::UI::Button	1507	$self->{options}->add (new DC::UI::Button
1085	text => $kw,	1508	text => $kw,
1086	on_activate => sub {	1509	on_activate => sub {
1087	$self->send ($kw);	1510	$self->send ($kw);
1088	0	1511	0
1089	},	1512	},
1090	);	1513	);
1091	}	1514	}
1092	}	1515	}
1093		1516
1094	sub feed {	1517	sub feed {
1095	my ($self, $msg) = @_;	1518	my ($self, $type, @arg) = @_;
1096		1519
1097	CFPlus::weaken $self;	1520	DC::weaken $self;
1098		1521
1099	if ($msg->{msgtype} eq "reply") {	1522	if ($type eq "update") {
		1523	my (%info) = @arg;
		1524
1100	$self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};	1525	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1101	$self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};	1526	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1102
1103	my $text = "\n" . CFPlus::asxml $msg->{msg};
1104	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1105	my @link;
1106	$text =~ s{
1107	($match)
1108	}{
1109	my $kw = $1;
1110
1111	push @link, new CFPlus::UI::Label
1112	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1113	can_hover => 1,
1114	can_events => 1,
1115	padding_x => 0,
1116	padding_y => 0,
1117	on_button_up => sub {
1118	$self->send ($kw);
1119	};
1120
1121	"\x{fffc}"
1122	}giex;
1123		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
1124	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1550	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1125	$self->{textview}->scroll_to_bottom;	1551	$self->{textview}->scroll_to_bottom;
		1552	}
		1553
1126	$self->update_options;	1554	$self->update_options;
1127	} else {	1555	} else {
1128	$self->destroy;	1556	$self->destroy;
1129	}	1557	}
1130		1558
…		…
1132	}	1560	}
1133		1561
1134	sub send {	1562	sub send {
1135	my ($self, $msg) = @_;	1563	my ($self, $msg) = @_;
1136		1564
1137	$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	});
1138	$self->{textview}->scroll_to_bottom;	1571	$self->{textview}->scroll_to_bottom;
1139		1572
1140	$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);
1141	}	1574	}
1142		1575
1143	sub destroy {	1576	sub destroy {
1144	my ($self) = @_;	1577	my ($self) = @_;
1145		1578
1146	#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
1147		1580
1148	if ($self->{conn}) {	1581	if ($self->{conn}) {
1149	$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};
1150	delete $self->{conn}{npc_dialog};	1583	delete $self->{conn}{npc_dialog};
1151	$self->{conn}->disconnect_ext ($self->{id});	1584	$self->{conn}->disconnect_ext ($self->{id});
1152	}	1585	}
1153		1586
1154	$self->SUPER::destroy;	1587	$self->SUPER::destroy;

Diff Legend

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