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.97 by root, Fri Apr 6 08:09:43 2007 UTC vs.
Revision 1.197 by root, Tue May 20 02:47:21 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';
18		16
19	sub new {	17	sub new {
20	my $class = shift;	18	my ($class, %arg) = @_;
21		19
22	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });	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	);
23		28
24	$self->{map_widget}->clr_commands;	29	$self->{map_widget}->clr_commands;
25		30
26	my @cmd_help = map {	31	my @cmd_help = map {
27	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	32	$_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28	or die "unparseable command help: $_->{kw}[0]";	33	or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
29		34
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
34	my (undef, @par) = CFPlus::Pod::section_of $_;	39	my (undef, @par) = DC::Pod::section_of $_;
35	my $text = CFPlus::Pod::as_label @par;	40	my $text = DC::Pod::as_label @par;
36		41
37	$_ = $_ eq ".*" ? "" : " $_"	42	$_ = $_ eq ".*" ? "" : " $_"
38	for @args;	43	for @args;
39		44
40	map ["$cmd$_", $text],	45	map ["$cmd$_", $text],
41	sort { (length $a) <=> (length $b) }	46	sort { (length $a) <=> (length $b) }
42	@args	47	@args
43	} sort { $a->{par} <=> $b->{par} }	48	} sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
44	CFPlus::Pod::find command => "*";	49	DC::Pod::find command => "*";
45		50
46	$self->connect_ext (event_capabilities => sub {	51	$self->{json_coder}
		52	->convert_blessed
		53	->filter_json_single_key_object ("\fw" => sub {
		54	$self->{widget}{$_[0]}
		55	})
		56	->filter_json_single_key_object ("\fc" => sub {
47	my ($cap) = @_;	57	my ($id) = @_;
48		58	sub {
49	if (my $ts = $cap->{tileset}) {	59	$self->send_exti_msg (w_e => $id, @_);
50	if (my ($default) = grep $_->[2] & 1, @$ts) {
51	$self->{tileset} = $default;
52	$self->{tilesize} = $default->[3];
53	$self->setup_req (tileset => $default->[0]);
54
55	my $w = int $self->{mapw} * 32 / $self->{tilesize};
56	my $h = int $self->{maph} * 32 / $self->{tilesize};
57
58	$self->setup_req (mapsize => "${w}x${h}");
59	}	60	}
60	}	61	});
		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;
61	});	74	});
62		75
63	$self->{map_widget}->add_command (@$_)	76	$self->{map_widget}->add_command (@$_)
64	for @cmd_help;	77	for @cmd_help;
65		78
66	{	79	{
67	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	80	$self->{dialogue} = my $tex = new_from_file DC::Texture
68	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;	81	DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
69	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});	82	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
70	}	83	}
71		84
72	{	85	{
73	$self->{noface} = my $tex = new_from_file CFPlus::Texture	86	$self->{noface} = my $tex = new_from_file DC::Texture
74	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;	87	DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
75	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});	88	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
76	}	89	}
77		90
78	$self->{open_container} = 0;	91	$self->{open_container} = 0;
79		92
…		…
81	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	94	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
82		95
83	$self	96	$self
84	}	97	}
85		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 => {},
		176	};
		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	#############################################################################
		348
86	sub logprint {	349	sub logprint {
87	my ($self, @a) = @_;	350	my ($self, @a) = @_;
88		351
89	$self->{log_fh} ||= do {	352	DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
90	my $path = "$Crossfire::VARDIR/log.$self->{host}";
91
92	open my $fh, ">>:utf8", $path
93	or die "Couldn't open logfile $path: $!";
94
95	$fh->autoflush (1);
96
97	$fh;
98	};
99
100	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
101
102	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
103	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
104
105	print {$self->{log_fh}} "$ts ", @a, "\n";
106	}	353	}
107		354
108	sub _stat_numdiff {	355	sub _stat_numdiff {
109	my ($self, $name, $old, $new) = @_;	356	my ($self, $name, $old, $new) = @_;
110		357
…		…
194		441
195	if (	442	if (
196	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	443	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
197	) {	444	) {
198	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	445	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
199	$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);
200	}	447	}
201		448
202	$self->update_stats_window ($stats, $prev);	449	$self->update_stats_window ($stats, $prev);
203		450
204	$self->{prev_stats} = { %$stats };	451	$self->{prev_stats} = { %$stats };
…		…
243	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	490	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
244	$::GAUGES->{food} ->set_value ($fo, $fo_m);	491	$::GAUGES->{food} ->set_value ($fo, $fo_m);
245	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	492	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
246	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	493	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	494	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248	my $rng = $stats->{+CS_STAT_RANGE};	495	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
249	$rng =~ s/^Range: //; # thank you so much dear server	496	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
250	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
251	my $title = $stats->{+CS_STAT_TITLE};	497	my $title = $stats->{+CS_STAT_TITLE};
252	$title =~ s/^Player: //;	498	$title =~ s/^Player: //;
253	$::STATWIDS->{title} ->set_text ("Title: " . $title);	499	$::STATWIDS->{title} ->set_text ("Title: " . $title);
254		500
255	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	501	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
272	for keys %RES_TBL;	518	for keys %RES_TBL;
273		519
274	my $sktbl = $::STATWIDS->{skill_tbl};	520	my $sktbl = $::STATWIDS->{skill_tbl};
275	my @skills = keys %{ $self->{skill_info} };	521	my @skills = keys %{ $self->{skill_info} };
276		522
277	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
278	$sktbl->clear;	531	$sktbl->clear;
279		532
		533	my $sw = $self->{skillwid}{""} ||= [
280	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	534	0, 0, (new DC::UI::Label text => "Experience", align => 1),
281	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	535	1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
282	$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),
283	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	538	4, 0, (new DC::UI::Label text => "Experience", align => 1),
284	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	539	5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
285	$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;
286		545
287	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>";
288		547
289	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);
290	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);
291		550
292	my ($x, $y) = (0, 1);	551	my ($x, $y) = (0, 1);
293	for (	552	for (@order) {
294	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
295	map [$_, $self->{skill_info}{$_}],
296	grep exists $stats->{$_},
297	@skills
298	) {
299	my ($idx, $name) = @$_;	553	my ($idx, $name) = @$_;
300		554
301	my $spell_cb = sub {	555	my $spell_cb = sub {
302	my ($widget, $ev) = @_;	556	my ($widget, $ev) = @_;
303		557
304	if ($ev->{button} == 1) {	558	if ($ev->{button} == 1) {
305	$::CONN->user_send ("ready_skill $name");	559	$::CONN->user_send ("ready_skill $name");
306	} elsif ($ev->{button} == 2) {	560	} elsif ($ev->{button} == 2) {
307	$::CONN->user_send ("use_skill $name");	561	$::CONN->user_send ("use_skill $name");
308	} elsif ($ev->{button} == 3) {	562	} elsif ($ev->{button} == 3) {
309	my $shortname = CFPlus::shorten $name, 14;	563	my $shortname = DC::shorten $name, 14;
310	(new CFPlus::UI::Menu	564	(new DC::UI::Menu
311	items => [	565	items => [
312	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],	566	["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
313	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],	567	["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
314	],	568	],
315	)->popup ($ev);	569	)->popup ($ev);
316	} else {	570	} else {
317	return 0;	571	return 0;
318	}	572	}
319		573
320	1	574	1
321	};	575	};
322		576
323	$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
324	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),
325	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	581
		582	# level
		583	(new DC::UI::Label
326	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),
		585
		586	# progress
		587	(new DC::UI::ExperienceProgress),
		588
		589	# label
327	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	590	(new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
328	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	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	;
329		600
330	$x++ and ($x, $y) = (0, $y + 1);	601	$x++ and ($x, $y) = (0, $y + 1);
331	}	602	}
332	}
333		603
334	for (grep exists $stats->{$_}, @skills) {	604	$sktbl->add_at (@add);
335	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
336	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
337	}	605	}
338	}
339		606
340	sub macro_send {	607	for (@order) {
341	my ($self, $macro) = @_;	608	my ($idx, $name) = @$_;
		609	my $val = $stats->{$idx};
342		610
343	for my $cmd (@{ $macro->{action} }) {	611	next if $prev->{$idx}[1] eq $val->[1];
344	$self->send_command ($cmd);	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);
345	}	620	}
346	}	621	}
347		622
348	sub user_send {	623	sub user_send {
349	my ($self, $command) = @_;	624	my ($self, $command) = @_;
…		…
351	$self->{record}->($command)	626	$self->{record}->($command)
352	if $self->{record};	627	if $self->{record};
353		628
354	$self->logprint ("send: ", $command);	629	$self->logprint ("send: ", $command);
355	$self->send_command ($command);	630	$self->send_command ($command);
356	::status ($command);
357	}	631	}
358		632
359	sub record {	633	sub record {
360	my ($self, $cb) = @_;	634	my ($self, $cb) = @_;
361		635
…		…
369	}	643	}
370		644
371	sub feed_map1a {	645	sub feed_map1a {
372	my ($self, $data) = @_;	646	my ($self, $data) = @_;
373		647
374	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	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 {
375	$self->{map_widget}->update;	676	$self->{map_widget}->update;
		677	}
376	}	678	}
377		679
378	sub magicmap {	680	sub magicmap {
379	my ($self, $w, $h, $x, $y, $data) = @_;	681	my ($self, $w, $h, $x, $y, $data) = @_;
380		682
…		…
382	}	684	}
383		685
384	sub flush_map {	686	sub flush_map {
385	my ($self) = @_;	687	my ($self) = @_;
386		688
387	my $map_info = delete $self->{map_info}	689	return unless $self->{map_info};
388	or return;
389		690
		691	for my $map_info (values %{ $self->{map_cache} || {} }) {
390	my ($hash, $x, $y, $w, $h) = @$map_info;	692	my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
391		693
392	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	694	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
		695
		696	if ($data ne $$rdata) {
		697	$map_info->[1] = \$data;
		698	my $cdata = Compress::LZF::compress $data;
		699	warn "db_put $hash $x $y ", length $data, " > ", length $cdata;
393	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	700	DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
394	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	701	}
		702	}
395	}	703	}
396		704
397	sub map_clear {	705	sub map_clear {
398	my ($self) = @_;	706	my ($self) = @_;
399		707
400	$self->flush_map;	708	$self->flush_map;
		709	delete $self->{map_info};
401	delete $self->{neigh_map};	710	delete $self->{neigh_map};
402		711
403	$self->{map}->clear;	712	$self->{map}->clear;
404	delete $self->{map_widget}{magicmap};	713	delete $self->{map_widget}{magicmap};
405	}	714	}
406		715
407	sub bg_fetch {	716	sub bg_fetch {
408	my ($self) = @_;	717	my ($self) = @_;
409		718
410	my $id;	719	my $tile;
411		720
412	do {	721	do {
413	$id = pop @{$self->{bg_fetch}}	722	$tile = pop @{$self->{bg_fetch}}
414	or return;	723	or return;
415	} while $self->{texture}[$id];	724	} while $self->{texture}[$tile];
416		725
417	CFPlus::DB::get tilecache => $id, sub {	726	DC::DB::get tilecache => $tile, sub {
418	my ($data) = @_;	727	my ($data) = @_;
419		728
420	$self->set_texture ($id => $data)	729	return unless $self->{map}; # stop when destroyed
		730
421	if defined $data;	731	if (defined $data) {
		732	$self->have_tile ($tile, $data);
		733	$self->{texture}[$tile]->upload;
		734	}
422		735
423	$self->bg_fetch;	736	$self->bg_fetch;
424	};	737	};
425	}	738	}
426		739
427	sub load_map($$$) {	740	sub load_map($$$$$$) {
428	my ($self, $hash, $x, $y) = @_;	741	my ($self, $hash, $x, $y, $w, $h) = @_;
429		742
430	CFPlus::DB::get $self->{mapcache} => $hash, sub {	743	my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
431	my ($data) = @_;
432		744
433	if (defined $data) {	745	my $cb = sub {
434	$data = Compress::LZF::decompress $data;	746	$map_info->[1] = \$_[0];
435	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
436		747
		748	return if 2505 == length $_[0];#d#
		749	warn "map_cache $hash $x $y $w $h ", length $_[0];#d#
		750
437	my $inprogress = @{ $self->{bg_fetch} || [] };	751	my $inprogress = @{ $self->{bg_fetch} || [] };
438	push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	752	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
439	$self->bg_fetch unless $inprogress;	753	$self->bg_fetch unless $inprogress;
440	}
441	};	754	};
		755
		756	if (my $map_info = $self->{map_cache_old}{$hash}) {
		757	$cb->(${ $map_info->[1] });
		758	} else {
		759	my $gen = $self->{map_change_gen};
		760
		761	DC::DB::get $self->{mapcache} => $hash, sub {
		762	return unless $gen == $self->{map_change_gen};
		763	return unless defined $_[0];
		764	$cb->(Compress::LZF::decompress $_[0]);
		765	};
		766	}
442	}	767	}
443		768
444	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	769	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
445	# (server resource,s latency, bandwidth), so this hack is warranted.	770	# (server resources, latency, bandwidth), so this hack is warranted.
446	# the right fix is to make real tiled maps with an overview file	771	# the right fix is to make real tiled maps with an overview file
447	sub send_mapinfo {	772	sub send_mapinfo {
448	my ($self, $data, $cb) = @_;	773	my ($self, $data, $cb) = @_;
449		774
450	if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {	775	if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
…		…
475	}	800	}
476		801
477	# this method does a "flood fill" into every tile direction	802	# this method does a "flood fill" into every tile direction
478	# it assumes that tiles are arranged in a rectangular grid,	803	# it assumes that tiles are arranged in a rectangular grid,
479	# i.e. a map is the same as the left of the right map etc.	804	# i.e. a map is the same as the left of the right map etc.
480	# failure to comply are harmless and result in display errors	805	# failure to comply is harmless and results in display errors
481	# at worst.	806	# at worst.
482	sub flood_fill {	807	sub flood_fill {
483	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;	808	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
484		809
485	# the server does not allow map paths > 6	810	# the server does not allow map paths > 6
…		…
510		835
511	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	836	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
512	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	837	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
513		838
514	} else {	839	} else {
		840	my $gen = $self->{map_change_gen};
515	$self->send_mapinfo ("spatial $path$tile", sub {	841	$self->send_mapinfo ("spatial $path$tile", sub {
		842	return unless $gen == $self->{map_change_gen};
		843
516	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	844	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
517		845
518	return if $mode ne "spatial";	846	return if $mode ne "spatial";
519		847
520	$x += $self->{map}->ox;	848	$x += $self->{map}->ox;
521	$y += $self->{map}->oy;	849	$y += $self->{map}->oy;
522		850
523	$self->load_map ($hash, $x, $y)	851	$self->load_map ($hash, $x, $y, $w, $h)
524	unless $self->{neigh_map}{$hash}[5]++;#d#	852	unless $self->{neigh_map}{$hash}[5]++;#d#
525		853
526	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];	854	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
527		855
528	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	856	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
…		…
534		862
535	sub map_change {	863	sub map_change {
536	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	864	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
537		865
538	$self->flush_map;	866	$self->flush_map;
		867
		868	++$self->{map_change_gen};
		869	$self->{map_cache_old} = delete $self->{map_cache};
539		870
540	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	871	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
541		872
542	my $mapmapw = $self->{mapmap}->{w};	873	my $mapmapw = $self->{mapmap}->{w};
543	my $mapmaph = $self->{mapmap}->{h};	874	my $mapmaph = $self->{mapmap}->{h};
…		…
555	$self->{map_info} = [$hash, $x, $y, $w, $h];	886	$self->{map_info} = [$hash, $x, $y, $w, $h];
556		887
557	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;	888	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
558	$::STATWIDS->{map}->set_text ("Map: " . $map);	889	$::STATWIDS->{map}->set_text ("Map: " . $map);
559		890
560	$self->load_map ($hash, $x, $y);	891	$self->load_map ($hash, $x, $y, $w, $h);
561	$self->flood_fill (0, 0, 0, "", $hash, $flags);	892	$self->flood_fill (0, 0, 0, "", $hash, $flags);
562	}	893	}
563		894
564	sub face_find {	895	sub face_find {
565	my ($self, $facenum, $face, $cb) = @_;	896	my ($self, $facenum, $face, $cb) = @_;
566		897
567	my $hash = "$face->{chksum},$face->{name}";	898	if ($face->{type} == 0) { # FT_FACE
568
569	my $id = CFPlus::DB::get_tile_id_sync $hash;	899	my $id = DC::DB::get_tile_id_sync $face->{name};
570		900
571	$face->{id} = $id;	901	$face->{id} = $id;
572	$self->{faceid}[$facenum] = $id;
573
574	$self->{map}->set_tileid ($facenum => $id);	902	$self->{map}->set_tileid ($facenum => $id);
575		903
576	CFPlus::DB::get tilecache => $id, $cb;	904	DC::DB::get tilecache => $id, $cb;
		905
		906	} elsif ($face->{type} & 1) { # with metadata
		907	DC::DB::get res_meta => $face->{name}, $cb;
		908
		909	} else { # no metadata
		910	DC::DB::get res_data => $face->{name}, $cb;
		911	}
577	}	912	}
578		913
579	sub face_update {	914	sub face_update {
580	my ($self, $facenum, $face, $changed) = @_;	915	my ($self, $facenum, $face, $changed) = @_;
581		916
		917	if ($face->{type} == 0) {
		918	# image, FT_FACE
582	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	919	DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
583	if $changed;	920	if $changed;
584		921
585	$self->set_texture ($face->{id} => delete $face->{image});	922	$self->have_tile ($face->{id}, delete $face->{data});
586	}
587		923
588	sub set_texture {	924	} elsif ($face->{type} & 1) {
		925	# split metadata case, FT_MUSIC, FT_SOUND
		926	if ($changed) { # new data
		927	my ($meta, $data) = unpack "(w/a*)*", $face->{data};
		928	$face->{data} = $meta;
		929
		930	# rely on strict ordering here and also on later fetch
		931	DC::DB::put res_data => $face->{name} => $data, sub { };
		932	DC::DB::put res_meta => $face->{name} => $meta, sub { };
		933	}
		934
		935	$face->{data} = $self->{json_coder}->decode ($face->{data});
		936	::add_license ($face);
		937	::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
		938	if $changed;
		939
		940	if ($face->{type} == 3) { # FT_MUSIC
		941	&::audio_music_push ($facenum);
		942	} elsif ($face->{type} == 5) { # FT_SOUND
		943	&::audio_sound_push ($facenum);
		944	}
		945
		946	} else {
		947	# flat resource case, FT_RSRC
		948	DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
		949	if $changed;
		950	}
		951
		952	if (my $cbs = $self->{face_cb}{$facenum}) {
		953	$_->($face, $changed) for @$cbs;
		954	}
		955	}
		956
		957	sub smooth_update {
		958	my ($self, $facenum, $face) = @_;
		959
		960	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		961	}
		962
		963	sub have_tile {
589	my ($self, $id, $data) = @_;	964	my ($self, $tile, $data) = @_;
590		965
591	$self->{texture}[$id] ||= do {	966	return unless $self->{map};
592	my $tex =	967
593	new_from_image CFPlus::Texture	968	my $tex = $self->{texture}[$tile] ||=
		969	new DC::Texture
		970	tile => $tile,
		971	image => $data, delete_image => 1,
594	$data, minify => 1, mipmap => 1;	972	minify => 1, mipmap => 1;
595		973
596	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	974	if (my $cbs = delete $self->{tile_cb}{$tile}) {
597	$self->{map_widget}->update;	975	$_->($tex) for @$cbs;
598
599	$tex
600	};	976	}
		977	}
		978
		979	# call in non-void context registers a temporary
		980	# hook with handle, otherwise its permanent
		981	sub on_face_change {
		982	my ($self, $num, $cb) = @_;
		983
		984	push @{$self->{face_cb}{$num}}, $cb;
		985
		986	defined wantarray
		987	? DC::guard {
		988	@{$self->{face_cb}{$num}}
		989	= grep $_ != $cb,
		990	@{$self->{face_cb}{$num}};
		991	}
		992	: ()
		993	}
		994
		995	# call in non-void context registers a temporary
		996	# hook with handle, otherwise its permanent
		997	sub register_face_handler {
		998	my ($self, $num, $cb) = @_;
		999
		1000	return unless $num;
		1001
		1002	# invoke if available right now
		1003	$cb->($self->{face}[$num], 0)
		1004	unless exists $self->{face}[$num]{loading};
		1005
		1006	# future changes
		1007	$self->on_face_change ($num => $cb)
601	}	1008	}
602		1009
603	sub sound_play {	1010	sub sound_play {
604	my ($self, $x, $y, $soundnum, $type) = @_;	1011	my ($self, $type, $face, $dx, $dy, $vol) = @_;
605		1012
606	$self->{sound_play}->($x, $y, $soundnum, $type);	1013	&::audio_sound_play ($face, $dx, $dy, $vol)
		1014	unless $type & 1; # odd types are silent for future expansion
607	}	1015	}
608		1016
609	my $LAST_QUERY; # server is stupid, stupid, stupid	1017	my $LAST_QUERY; # server is stupid, stupid, stupid
610		1018
611	sub query {	1019	sub query {
…		…
615	$LAST_QUERY = $prompt;	1023	$LAST_QUERY = $prompt;
616		1024
617	$self->{query}-> ($self, $flags, $prompt);	1025	$self->{query}-> ($self, $flags, $prompt);
618	}	1026	}
619		1027
620	sub drawinfo {	1028	sub sanitise_xml($) {
621	my ($self, $color, $text) = @_;	1029	local $_ = shift;
622		1030
623	my @color = (	1031	# we now weed out all tags we do not support
		1032	s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
		1033	}{
		1034	"&lt;"
		1035	}gex;
		1036
		1037	# now all entities
		1038	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
		1039
		1040	# handle some elements
		1041	s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		1042	s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		1043
		1044	s/\s+$//;
		1045
		1046	$_
		1047	}
		1048
		1049	our %NAME_TO_COLOR = (
		1050	black => 0,
		1051	white => 1,
		1052	darkblue => 2,
		1053	red => 3,
		1054	orange => 4,
		1055	lightblue => 5,
		1056	darkorange => 6,
		1057	green => 7,
		1058	darkgreen => 8,
		1059	grey => 9,
		1060	brown => 10,
		1061	yellow => 11,
		1062	tan => 12,
		1063	);
		1064
		1065	our @CF_COLOR = (
624	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	1066	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
625	[1.00, 1.00, 1.00],	1067	[1.00, 1.00, 1.00],
626	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	1068	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
627	[1.00, 0.00, 0.00],	1069	[1.00, 0.00, 0.00],
628	[1.00, 0.54, 0.00],	1070	[1.00, 0.54, 0.00],
629	[0.11, 0.56, 1.00],	1071	[0.11, 0.56, 1.00],
630	[0.93, 0.46, 0.00],	1072	[0.93, 0.46, 0.00],
631	[0.18, 0.54, 0.34],	1073	[0.18, 0.54, 0.34],
632	[0.56, 0.73, 0.56],	1074	[0.56, 0.73, 0.56],
633	[0.80, 0.80, 0.80],	1075	[0.80, 0.80, 0.80],
634	[0.75, 0.61, 0.20],	1076	[0.75, 0.61, 0.20],
635	[0.99, 0.77, 0.26],	1077	[0.99, 0.77, 0.26],
636	[0.74, 0.65, 0.41],	1078	[0.74, 0.65, 0.41],
637	);	1079	);
638		1080
639	my $fg = $color[$color % @color];	1081	sub msg {
		1082	my ($self, $color, $type, $text, @extra) = @_;
640		1083
		1084	$text = sanitise_xml $text;
		1085
		1086	if (my $cb = $self->{cb_msg}{$type}) {
		1087	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1088	} elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
		1089	$type =~ s/-/_/g;
		1090	$self->{$type} = $text;
		1091	} else {
641	$self->logprint ("info: ", $text);	1092	$self->logprint ("msg: ", $text);
		1093	return if $color < 0; # negative color == ignore if not understood
642		1094
		1095	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
		1096
643	# try to create single paragraphs of multiple lines sent by the server	1097	## try to create single paragraphs of multiple lines sent by the server
		1098	# no longer neecssary with TRT servers
644	$text =~ s/(?<=\S)\n(?=\w)/ /g;	1099	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
645		1100
646	$text = CFPlus::asxml $text;
647	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
648	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
649
650	::message ({ fg => $fg, markup => $_ })
651	for split /\n/, $text;	1101	for (split /\n/, $text) {
		1102	::message ({
		1103	fg => $fg,
		1104	markup => $_,
		1105	type => $type,
		1106	extra => [@extra],
		1107	color_flags => $color, #d# ugly, kill
		1108	});
652		1109
		1110	$color &= ~NDI_CLEAR; # only clear once for multiline messages
		1111	# actually, this is an ugly design. _we_ should control the channels,
		1112	# not some random other widget, as the channels are clearly protocol-specific.
		1113	# then we could also react to flags such as CLEAR without resorting to
		1114	# hacks such as color_flags, above.
		1115	}
		1116
653	$self->{statusbox}->add ($text,	1117	$self->{statusbox}->add ($text,
654	group => $text,	1118	group => $text,
655	fg => $fg,	1119	fg => $fg,
656	timeout => $color >= 2 ? 180 : 10,	1120	timeout => $color >= 2 ? 180 : 10,
657	tooltip_font => $::FONT_FIXED,	1121	tooltip_font => $::FONT_FIXED,
658	);	1122	) if $type eq "info";
659	}	1123	}
660
661	sub drawextinfo {
662	my ($self, $color, $type, $subtype, $message) = @_;
663
664	$self->drawinfo ($color, $message);
665	}	1124	}
666		1125
667	sub spell_add {	1126	sub spell_add {
668	my ($self, $spell) = @_;	1127	my ($self, $spell) = @_;
669		1128
…		…
672	$spell->{message} =~ s/\n+$//;	1131	$spell->{message} =~ s/\n+$//;
673	$spell->{message} ||= "Server did not provide a description for this spell.";	1132	$spell->{message} ||= "Server did not provide a description for this spell.";
674		1133
675	$::SPELL_LIST->add_spell ($spell);	1134	$::SPELL_LIST->add_spell ($spell);
676		1135
677	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	1136	$self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
678	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	1137	$self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
679	}	1138	}
680		1139
681	sub spell_delete {	1140	sub spell_delete {
682	my ($self, $spell) = @_;	1141	my ($self, $spell) = @_;
683		1142
…		…
694	sub addme_success {	1153	sub addme_success {
695	my ($self) = @_;	1154	my ($self) = @_;
696		1155
697	my %skill_help;	1156	my %skill_help;
698		1157
699	for my $node (CFPlus::Pod::find skill_description => "*") {	1158	for my $node (DC::Pod::find skill_description => "*") {
700	my (undef, @par) = CFPlus::Pod::section_of $node;	1159	my (undef, @par) = DC::Pod::section_of $node;
701	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;	1160	$skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
702	};	1161	};
703		1162
704	for my $skill (values %{$self->{skill_info}}) {	1163	for my $skill (values %{$self->{skill_info}}) {
705	$self->{map_widget}->add_command ("ready_skill $skill",	1164	$self->{map_widget}->add_command ("ready_skill $skill",
706	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1165	(DC::asxml "Ready the skill '$skill'\n\n")
707	. $skill_help{$skill});	1166	. $skill_help{$skill});
708	$self->{map_widget}->add_command ("use_skill $skill",	1167	$self->{map_widget}->add_command ("use_skill $skill",
709	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1168	(DC::asxml "Immediately use the skill '$skill'\n\n")
710	. $skill_help{$skill});	1169	. $skill_help{$skill});
711	}	1170	}
712	}	1171	}
713		1172
714	sub eof {	1173	sub eof {
…		…
717	$self->{map_widget}->clr_commands;	1176	$self->{map_widget}->clr_commands;
718		1177
719	::stop_game ();	1178	::stop_game ();
720	}	1179	}
721		1180
722	sub image_info {
723	my ($self, $numfaces) = @_;
724
725	$self->{num_faces} = $numfaces;
726	$self->{face_prefetch} = [1 .. $numfaces];
727	$self->face_prefetch;
728	}
729
730	sub face_prefetch {
731	my ($self) = @_;
732
733	return unless $::CFG->{face_prefetch};
734
735	if ($self->{num_faces}) {
736	return if @{ $self->{send_queue} || [] };
737	my $todo = @{ $self->{face_prefetch} }
738	or return;
739
740	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
741
742	$self->send ("requestinfo image_sums $face $face");
743
744	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
745	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
746	} elsif (!exists $self->{num_faces}) {
747	$self->send ("requestinfo image_info");
748
749	$self->{num_faces} = 0;
750
751	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
752	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
753	}
754	}
755
756	sub update_floorbox {	1181	sub update_floorbox {
757	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1182	$DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
758	return unless $::CONN;	1183	return unless $::CONN;
759		1184
760	$::FLOORBOX->clear;	1185	$::FLOORBOX->clear;
761		1186
		1187	my @add;
		1188
762	my $row;	1189	my $row;
763	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {	1190	for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
		1191	next if $_->{tag} & 0x80000000;
764	if ($row < 6) {	1192	if ($row < 6) {
765	local $_->{face_widget}; # hack to force recreation of widget	1193	local $_->{face_widget}; # hack to force recreation of widget
766	local $_->{desc_widget}; # hack to force recreation of widget	1194	local $_->{desc_widget}; # hack to force recreation of widget
767	CFPlus::Item::update_widgets $_;	1195	DC::Item::update_widgets $_;
768		1196
		1197	push @add,
769	$::FLOORBOX->add (0, $row, $_->{face_widget});	1198	0, $row, $_->{face_widget},
770	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1199	1, $row, $_->{desc_widget};
771		1200
772	$row++;	1201	$row++;
773	} else {	1202	} else {
774	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1203	push @add, 1, $row, new DC::UI::Button
775	text => "More...",	1204	text => "More...",
776	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1205	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
777	);	1206	;
778	last;	1207	last;
779	}	1208	}
780	}	1209	}
781	if ($::CONN->{open_container}) {	1210	if ($::CONN->{open_container}) {
782	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1211	push @add, 1, $row++, new DC::UI::Button
783	text => "Close container",	1212	text => "Close container",
784	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1213	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
785	);	1214	;
786	}	1215	}
		1216
		1217	$::FLOORBOX->add_at (@add);
787	});	1218	});
788		1219
789	$::WANT_REFRESH++;	1220	$::WANT_REFRESH = 1;
790	}	1221	}
791		1222
792	sub set_opencont {	1223	sub set_opencont {
793	my ($conn, $tag, $name) = @_;	1224	my ($conn, $tag, $name) = @_;
794	$conn->{open_container} = $tag;	1225	$conn->{open_container} = $tag;
795	update_floorbox;	1226	update_floorbox;
796		1227
797	$::INV_RIGHT_HB->clear ();	1228	$::INVR_HB->clear;
798	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1229	$::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
799		1230
800	if ($tag != 0) { # Floor isn't closable, is it?	1231	if ($tag != 0) { # Floor isn't closable, is it?
801	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1232	$::INVR_HB->add (new DC::UI::Button
802	text => "Close container",	1233	text => "Close container",
803	tooltip => "Close the currently open container (if one is open)",	1234	tooltip => "Close the currently open container (if one is open)",
804	on_activate => sub {	1235	on_activate => sub {
805	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1236	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
806	if $tag != 0;	1237	if $tag != 0;
807	#if $CONN->{open_container} != 0;
808	0	1238	0
809	},	1239	},
810	);	1240	);
811	}	1241	}
812		1242
…		…
814	}	1244	}
815		1245
816	sub update_containers {	1246	sub update_containers {
817	my ($self) = @_;	1247	my ($self) = @_;
818		1248
819	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1249	$DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
820	my $todo = delete $self->{update_container}	1250	my $todo = delete $self->{update_container}
821	or return;	1251	or return;
822		1252
823	for my $tag (keys %$todo) {	1253	for my $tag (keys %$todo) {
824	update_floorbox if $tag == 0 or $tag == $self->{open_container};	1254	update_floorbox if $tag == 0 or $tag == $self->{open_container};
…		…
859	}	1289	}
860		1290
861	sub item_update {	1291	sub item_update {
862	my ($self, $item) = @_;	1292	my ($self, $item) = @_;
863		1293
864	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	1294	#print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
865		1295
866	CFPlus::Item::update_widgets $item;	1296	DC::Item::update_widgets $item;
867		1297
868	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1298	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
869	set_opencont ($::CONN, 0, "Floor");	1299	set_opencont ($::CONN, 0, "Floor");
870		1300
871	} elsif ($item->{flags} & F_OPEN) {	1301	} elsif ($item->{flags} & F_OPEN) {
872	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);	1302	set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
873		1303
874	} else {	1304	} else {
875	$self->{update_container}{$item->{container}}++;	1305	$self->{update_container}{$item->{container}}++;
876	$self->update_containers;	1306	$self->update_containers;
877	}	1307	}
…		…
888		1318
889	my $weight = .001 * $self->{player}{weight};	1319	my $weight = .001 * $self->{player}{weight};
890	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};	1320	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
891		1321
892	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);	1322	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
893	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);	1323	$::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
894	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);	1324	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
895	}	1325	}
896		1326
897	sub update_server_info {	1327	sub update_server_info {
898	my ($self) = @_;	1328	my ($self) = @_;
…		…
902	$::SERVER_INFO->set_markup (	1332	$::SERVER_INFO->set_markup (
903	"server <tt>$self->{host}:$self->{port}</tt>\n"	1333	"server <tt>$self->{host}:$self->{port}</tt>\n"
904	. "protocol version <tt>$self->{version}</tt>\n"	1334	. "protocol version <tt>$self->{version}</tt>\n"
905	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1335	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
906	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1336	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1337	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
907	. "editing support $yesno[!!$self->{editor_support}]\n"	1338	. "editing support $yesno[!!$self->{editor_support}]\n"
908	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1339	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1340	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
909	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1341	. "client support $yesno[$self->{cfplus_ext} > 0]"
910	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1342	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
911	. "map size $self->{mapw}×$self->{maph}\n"	1343	. "map size $self->{mapw}×$self->{maph}\n"
912	);	1344	);
913		1345
914	::setup_build_button ($self->{editor_support}->{builder_ui});
915	}	1346	}
916		1347
917	sub logged_in {	1348	sub logged_in {
918	my ($self) = @_;	1349	my ($self) = @_;
919		1350
920	$self->send_ext_req (cfplus_support => version => 1, sub {	1351	$self->send_ext_req (cfplus_support => version => 2, sub {
		1352	my (%msg) = @_;
		1353
921	$self->{cfplus_ext} = $_[0]{version};	1354	$self->{cfplus_ext} = $msg{version};
922	$self->update_server_info;	1355	$self->update_server_info;
923		1356
924	if ($self->{cfplus_ext} >= 2) {	1357	if ($self->{cfplus_ext} >= 2) {
925	$self->send_ext_req ("editor_support", sub {	1358	$self->send_ext_req ("editor_support", sub {
926	$self->{editor_support} = $_[0];	1359	$self->{editor_support} = { @_ };
927	$self->update_server_info;	1360	$self->update_server_info;
928		1361
929	0	1362	0
930	});	1363	});
931	}	1364	}
…		…
933	0	1366	0
934	});	1367	});
935		1368
936	$self->update_server_info;	1369	$self->update_server_info;
937		1370
938	$self->send_command ("output-sync $::CFG->{output_sync}");
939	$self->send_command ("output-count $::CFG->{output_count}");
940	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1371	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
941	$self->send_command ("pickup $::CFG->{pickup}");	1372	$self->send_command ("pickup $::CFG->{pickup}");
942	}	1373	}
943		1374
944	sub buildat {
945	my ($self, $builditem, $x, $y) = @_;
946
947	if ($self->{cfplus_ext}) {
948	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
949	}
950	}
951
952	sub lookat {	1375	sub lookat {
953	my ($self, $x, $y) = @_;	1376	my ($self, $x, $y) = @_;
954		1377
955	if ($self->{cfplus_ext}) {	1378	if ($self->{cfplus_ext}) {
956	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1379	$self->send_ext_req (lookat => $x, $y, sub {
957	my ($msg) = @_;	1380	my (%msg) = @_;
958		1381
959	if (exists $msg->{npc_dialog}) {	1382	if (exists $msg{npc_dialog}) {
960	# start npc chat dialog	1383	# start npc chat dialog
961	$self->{npc_dialog} = new CFPlus::NPCDialog::	1384	$self->{npc_dialog} = new DC::NPCDialog::
962	dx => $x,	1385	token => $msg{npc_dialog},
963	dy => $y,
964	title => "$msg->{npc_dialog} (NPC)",	1386	title => "$msg{npc_dialog}[0] (NPC)",
965	conn => $self,	1387	conn => $self,
966	;	1388	;
967	}	1389	}
968	});	1390	});
969	}	1391	}
…		…
976		1398
977	(delete $self->{npc_dialog})->destroy	1399	(delete $self->{npc_dialog})->destroy
978	if $self->{npc_dialog};	1400	if $self->{npc_dialog};
979		1401
980	$self->SUPER::destroy;	1402	$self->SUPER::destroy;
981	}
982		1403
		1404	%$self = ();
		1405	}
		1406
983	package CFPlus::NPCDialog;	1407	package DC::NPCDialog;
984		1408
985	our @ISA = 'CFPlus::UI::Toplevel';	1409	our @ISA = 'DC::UI::Toplevel';
986		1410
987	sub new {	1411	sub new {
988	my $class = shift;	1412	my $class = shift;
989		1413
990	my $self = $class->SUPER::new (	1414	my $self = $class->SUPER::new (
…		…
997	kw => { hi => 0, yes => 0, no => 0 },	1421	kw => { hi => 0, yes => 0, no => 0 },
998	has_close_button => 1,	1422	has_close_button => 1,
999	@_,	1423	@_,
1000	);	1424	);
1001		1425
1002	CFPlus::weaken (my $this = $self);	1426	DC::weaken (my $this = $self);
1003		1427
1004	$self->connect (delete => sub { $this->destroy; 1 });	1428	$self->connect (delete => sub { $this->destroy; 1 });
1005		1429
1006	# better use a pane...	1430	# better use a pane...
1007	$self->add (my $hbox = new CFPlus::UI::HBox);	1431	$self->add (my $hbox = new DC::UI::HBox);
1008	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);	1432	$hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1009		1433
1010	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1434	$hbox->add (my $vbox = new DC::UI::VBox);
1011		1435
1012	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1436	$vbox->add (new DC::UI::Label text => "Message Entry:");
1013	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1437	$vbox->add ($self->{entry} = new DC::UI::Entry
1014	tooltip => "#npc_message_entry",	1438	tooltip => "#npc_message_entry",
1015	on_activate => sub {	1439	on_activate => sub {
1016	my ($entry, $text) = @_;	1440	my ($entry, $text) = @_;
1017		1441
1018	return unless $text =~ /\S/;	1442	return unless $text =~ /\S/;
…		…
1022		1446
1023	0	1447	0
1024	},	1448	},
1025	);	1449	);
1026		1450
1027	$vbox->add ($self->{options} = new CFPlus::UI::VBox);	1451	$vbox->add ($self->{options} = new DC::UI::VBox);
1028		1452
1029	$self->{bye_button} = new CFPlus::UI::Button	1453	$self->{bye_button} = new DC::UI::Button
1030	text => "Bye (close)",	1454	text => "Bye (close)",
1031	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	1455	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1032	on_activate => sub { $this->destroy; 1 },	1456	on_activate => sub { $this->destroy; 1 },
1033	;	1457	;
1034		1458
1035	$self->update_options;	1459	$self->update_options;
1036		1460
1037	$self->{id} = $self->{conn}->send_ext_req (	1461	$self->{id} = "npc-channel-" . $self->{conn}->token;
1038	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1462	$self->{conn}->connect_ext ($self->{id} => sub {
1039	sub { $this && $this->feed (@_) }	1463	$this->feed (@_) if $this;
1040	);	1464	});
		1465
		1466	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1041		1467
1042	$self->{entry}->grab_focus;	1468	$self->{entry}->grab_focus;
1043		1469
1044	$self->{textview}->add_paragraph ({	1470	$self->{textview}->add_paragraph ({
1045	fg => [1, 1, 0, 1],	1471	fg => [1, 1, 0, 1],
…		…
1051	};	1477	};
1052		1478
1053	sub update_options {	1479	sub update_options {
1054	my ($self) = @_;	1480	my ($self) = @_;
1055		1481
1056	CFPlus::weaken $self;	1482	DC::weaken $self;
1057		1483
1058	$self->{options}->clear;	1484	$self->{options}->clear;
1059	$self->{options}->add ($self->{bye_button});	1485	$self->{options}->add ($self->{bye_button});
1060		1486
1061	for my $kw (sort keys %{ $self->{kw} }) {	1487	for my $kw (sort keys %{ $self->{kw} }) {
1062	$self->{options}->add (new CFPlus::UI::Button	1488	$self->{options}->add (new DC::UI::Button
1063	text => $kw,	1489	text => $kw,
1064	on_activate => sub {	1490	on_activate => sub {
1065	$self->send ($kw);	1491	$self->send ($kw);
1066	0	1492	0
1067	},	1493	},
1068	);	1494	);
1069	}	1495	}
1070	}	1496	}
1071		1497
1072	sub feed {	1498	sub feed {
1073	my ($self, $msg) = @_;	1499	my ($self, $type, @arg) = @_;
1074		1500
1075	CFPlus::weaken $self;	1501	DC::weaken $self;
1076		1502
1077	if ($msg->{msgtype} eq "reply") {	1503	if ($type eq "update") {
		1504	my (%info) = @arg;
		1505
1078	$self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};	1506	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1079	$self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};	1507	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1080
1081	my $text = "\n" . CFPlus::asxml $msg->{msg};
1082	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1083	my @link;
1084	$text =~ s{
1085	($match)
1086	}{
1087	my $kw = $1;
1088
1089	push @link, new CFPlus::UI::Label
1090	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1091	can_hover => 1,
1092	can_events => 1,
1093	padding_x => 0,
1094	padding_y => 0,
1095	on_button_up => sub {
1096	$self->send ($kw);
1097	};
1098
1099	"\x{fffc}"
1100	}giex;
1101		1508
		1509	if (exists $info{msg}) {
		1510	my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
		1511	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1512	my @link;
		1513	$text =~ s{
		1514	($match)
		1515	}{
		1516	my $kw = $1;
		1517
		1518	push @link, new DC::UI::Label
		1519	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1520	can_hover => 1,
		1521	can_events => 1,
		1522	padding_x => 0,
		1523	padding_y => 0,
		1524	on_button_up => sub {
		1525	$self->send ($kw);
		1526	};
		1527
		1528	"\x{fffc}"
		1529	}giex;
		1530
1102	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1531	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1103	$self->{textview}->scroll_to_bottom;	1532	$self->{textview}->scroll_to_bottom;
		1533	}
		1534
1104	$self->update_options;	1535	$self->update_options;
1105	} else {	1536	} else {
1106	$self->destroy;	1537	$self->destroy;
1107	}	1538	}
1108		1539
…		…
1110	}	1541	}
1111		1542
1112	sub send {	1543	sub send {
1113	my ($self, $msg) = @_;	1544	my ($self, $msg) = @_;
1114		1545
1115	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1546	$self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1116	$self->{textview}->scroll_to_bottom;	1547	$self->{textview}->scroll_to_bottom;
1117		1548
1118	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1549	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1119	}	1550	}
1120		1551
1121	sub destroy {	1552	sub destroy {
1122	my ($self) = @_;	1553	my ($self) = @_;
1123		1554
1124	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1555	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1125		1556
1126	if ($self->{conn}) {	1557	if ($self->{conn}) {
1127	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1558	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1128	delete $self->{conn}{npc_dialog};	1559	delete $self->{conn}{npc_dialog};
1129	$self->{conn}->disconnect_ext ($self->{id});	1560	$self->{conn}->disconnect_ext ($self->{id});
1130	}	1561	}
1131		1562
1132	$self->SUPER::destroy;	1563	$self->SUPER::destroy;

Diff Legend

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