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

Diff Legend

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