ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.201 by root, Wed Sep 3 06:35:55 2008 UTC

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

Diff Legend

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