[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:22:30 2006 UTC

…		…
1	package CFClient::Protocol;	1	package CFPlus::Protocol;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
		8	use CFPlus;
8	use CFClient::UI;	9	use CFPlus::UI;
		10	use CFPlus::Pod;
9		11
10	use base 'Crossfire::Protocol::Base';	12	use base 'Crossfire::Protocol::Base';
11		13
12	sub new {	14	sub new {
13	my $class = shift;	15	my $class = shift;
14		16
15	my $self = $class->SUPER::new (@_);	17	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
16		18
17	$self->{map_widget}->clr_commands;	19	$self->{map_widget}->clr_commands;
18		20
19	my $parser = new Pod::POM;	21	my @cmd_help = map {
20	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
21
22	for my $head2 ($pod->head1->[-2]->head2) {
23	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	22	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
24	or next;	23	or die "unparseable command help: $_->{kw}[0]";
25		24
26	my $cmd = $1;	25	my $cmd = $1;
27	my @args = split /\\|/, $2;	26	my @args = split /\\|/, $2;
28	@args = (".*") unless @args;	27	@args = (".*") unless @args;
29		28
		29	my (undef, @par) = CFPlus::Pod::section_of $_;
		30	my $text = CFPlus::Pod::as_label @par;
		31
30	$_ = $_ eq ".*" ? "" : " $_"	32	$_ = $_ eq ".*" ? "" : " $_"
31	for @args;	33	for @args;
32		34
33	my $text = CFClient::pod_to_pango $head2->content;	35	map ["$cmd$_", $text],
34
35	$self->{map_widget}->add_command ("$cmd$_", $text)
36	for sort { (length $a) <=> (length $b) }	36	sort { (length $a) <=> (length $b) }
37	@args;	37	@args
38	}	38	} sort { $a->{par} <=> $b->{par} }
		39	CFPlus::Pod::find command => "*";
39		40
		41	$self->{map_widget}->add_command (@$_)
		42	for @cmd_help;
		43
40	$self->{noface} = new_from_file CFClient::Texture	44	$self->{noface} = new_from_file CFPlus::Texture
41	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	45	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		46
		47	{
		48	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		49	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		50	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		51	}
42		52
43	$self->{open_container} = 0;	53	$self->{open_container} = 0;
44		54
45	# "global"	55	# "global"
46	$self->{tilecache} = CFClient::db_table "tilecache";	56	$self->{tilecache} = CFPlus::db_table "tilecache"
		57	or die "tilecache: unable to open database table";
47	$self->{facemap} = CFClient::db_table "facemap";	58	$self->{facemap} = CFPlus::db_table "facemap"
		59	or die "facemap: unable to open database table";
48		60
49	# per server	61	# per server
50	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	62	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
		63	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
51		64
52	$self	65	$self
53	}	66	}
		67
		68	sub logprint {
		69	my ($self, @a) = @_;
		70
		71	$self->{log_fh} \|\|= do {
		72	my $path = "$Crossfire::VARDIR/log.$self->{host}";
		73
		74	open my $fh, ">>:utf8", $path
		75	or die "Couldn't open logfile $path: $!";
		76
		77	$fh->autoflush (1);
		78
		79	$fh;
		80	};
		81
		82	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
		83
		84	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
		85	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
		86
		87	print {$self->{log_fh}} "$ts ", @a, "\n";
		88	}
		89
		90	sub _stat_numdiff {
		91	my ($self, $name, $old, $new) = @_;
		92
		93	my $diff = $new - $old;
		94
		95	$diff = 0.01 * int $diff * 100;
		96
		97	0.1 >= abs $diff ? ()
		98	: $diff < 0 ? "$name$diff" : "$name+$diff"
		99	}
		100
		101	sub _stat_skillmaskdiff {
		102	my ($self, $name, $old, $new) = @_;
		103
		104	my $diff = $old ^ $new
		105	or return;
		106
		107	my @diff = map
		108	{
		109	$diff & $_
		110	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		111	: ()
		112	}
		113	sort { $a <=> $b } keys %{$self->{spell_paths}};
		114
		115	join "", @diff
		116	}
		117
		118	# all stats that are chacked against changes
		119	my @statchange = (
		120	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		121	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		122	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		123	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		124	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		125	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		126	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		127	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		128	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		129	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		130	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		131	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		132	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		133	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		134	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		135	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		136	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		137	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		138	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		139	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		140	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		141	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		142	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		143	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		144	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		145	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		146	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		147	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		148	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		149	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		150	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		151	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		152	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		153	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		154	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		155	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		156	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		157	);
54		158
55	sub stats_update {	159	sub stats_update {
56	my ($self, $stats) = @_;	160	my ($self, $stats) = @_;
57		161
58	if (my $exp = $stats->{+CS_STAT_EXP64}) {	162	my $prev = $self->{prev_stats} \|\| { };
59	my $diff = $exp - $self->{prev_exp};	163
		164	if (my @diffs =
		165	(
		166	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		167	map {
		168	$stats->{$_} && $prev->{$_}
		169	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		170	} sort { $a <=> $b } keys %{$self->{skill_info}}
		171	)
		172	) {
		173	my $msg = join " ", @diffs;
60	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	174	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
61	if exists $self->{prev_exp} && $diff;
62	$self->{prev_exp} = $exp;
63	}	175	}
64		176
		177	if (
		178	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		179	) {
		180	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		181	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		182	}
		183
65	::update_stats_window ($stats);	184	$self->update_stats_window ($stats, $prev);
		185
		186	$self->{prev_stats} = { %$stats };
		187	}
		188
		189	my %RES_TBL = (
		190	phys => CS_STAT_RES_PHYS,
		191	magic => CS_STAT_RES_MAG,
		192	fire => CS_STAT_RES_FIRE,
		193	elec => CS_STAT_RES_ELEC,
		194	cold => CS_STAT_RES_COLD,
		195	conf => CS_STAT_RES_CONF,
		196	acid => CS_STAT_RES_ACID,
		197	drain => CS_STAT_RES_DRAIN,
		198	ghit => CS_STAT_RES_GHOSTHIT,
		199	pois => CS_STAT_RES_POISON,
		200	slow => CS_STAT_RES_SLOW,
		201	para => CS_STAT_RES_PARA,
		202	tund => CS_STAT_TURN_UNDEAD,
		203	fear => CS_STAT_RES_FEAR,
		204	depl => CS_STAT_RES_DEPLETE,
		205	deat => CS_STAT_RES_DEATH,
		206	holyw => CS_STAT_RES_HOLYWORD,
		207	blind => CS_STAT_RES_BLIND,
		208	);
		209
		210	sub update_stats_window {
		211	my ($self, $stats, $prev) = @_;
		212
		213	# I love text protocols...
		214
		215	my $hp = $stats->{+CS_STAT_HP} * 1;
		216	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		217	my $sp = $stats->{+CS_STAT_SP} * 1;
		218	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		219	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		220	my $fo_m = 999;
		221	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		222	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		223
		224	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		225	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		226	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		227	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		228	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		229	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		230	my $rng = $stats->{+CS_STAT_RANGE};
		231	$rng =~ s/^Range: //; # thank you so much dear server
		232	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
		233	my $title = $stats->{+CS_STAT_TITLE};
		234	$title =~ s/^Player: //;
		235	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		236
		237	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		238	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		239	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		240	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		241	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		242	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		243	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		244	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		245	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		246	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		247	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		248	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		249	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		250
		251	$self->update_weight;
		252
		253	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		254	for keys %RES_TBL;
		255
		256	my $sktbl = $::STATWIDS->{skill_tbl};
		257	my @skills = keys %{ $self->{skill_info} };
		258
		259	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		260	$sktbl->clear;
		261
		262	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		263	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		264	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		265	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		266	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		267	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		268
		269	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
		270
		271	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		272	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		273
		274	my ($x, $y) = (0, 1);
		275	for (
		276	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		277	map [$_, $self->{skill_info}{$_}],
		278	grep exists $stats->{$_},
		279	@skills
		280	) {
		281	my ($idx, $name) = @$_;
		282
		283	my $spell_cb = sub {
		284	my ($widget, $ev) = @_;
		285
		286	if ($ev->{button} == 1) {
		287	$::CONN->user_send ("ready_skill $name");
		288	} elsif ($ev->{button} == 2) {
		289	$::CONN->user_send ("use_skill $name");
		290	} elsif ($ev->{button} == 3) {
		291	(new CFPlus::UI::Menu
		292	items => [
		293	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
		294	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
		295	],
		296	)->popup ($ev);
		297	} else {
		298	return 0;
		299	}
		300
		301	1
		302	};
		303
		304	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
		305	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
		306	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
		307	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
		308	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		309	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
		310
		311	$x++ and ($x, $y) = (0, $y + 1);
		312	}
		313	}
		314
		315	for (grep exists $stats->{$_}, @skills) {
		316	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		317	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		318	}
66	}	319	}
67		320
68	sub user_send {	321	sub user_send {
69	my ($self, $command) = @_;	322	my ($self, $command) = @_;
70		323
		324	if ($self->{record}) {
		325	push @{$self->{record}}, $command;
		326	}
		327
		328	$self->logprint ("send: ", $command);
71	$self->send_command ($command);	329	$self->send_command ($command);
72	::status $command;	330	::status ($command);
		331	}
		332
		333	sub start_record {
		334	my ($self) = @_;
		335
		336	$self->{record} = [];
		337	}
		338
		339	sub stop_record {
		340	my ($self) = @_;
		341	return delete $self->{record};
73	}	342	}
74		343
75	sub map_scroll {	344	sub map_scroll {
76	my ($self, $dx, $dy) = @_;	345	my ($self, $dx, $dy) = @_;
77		346
79	}	348	}
80		349
81	sub feed_map1a {	350	sub feed_map1a {
82	my ($self, $data) = @_;	351	my ($self, $data) = @_;
83		352
84	$self->{map}->map1a_update ($data);	353	$self->{map}->map1a_update ($data, $self->{setup}{extmap});
85	$self->{map_widget}->update;	354	$self->{map_widget}->update;
		355	}
		356
		357	sub magicmap {
		358	my ($self, $w, $h, $x, $y, $data) = @_;
		359
		360	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
86	}	361	}
87		362
88	sub flush_map {	363	sub flush_map {
89	my ($self) = @_;	364	my ($self) = @_;
90		365
…		…
103		378
104	$self->flush_map;	379	$self->flush_map;
105	delete $self->{neigh_map};	380	delete $self->{neigh_map};
106		381
107	$self->{map}->clear;	382	$self->{map}->clear;
		383	delete $self->{map_widget}{magicmap};
108	}	384	}
109		385
110		386
111	sub load_map($$$) {	387	sub load_map($$$) {
112	my ($self, $hash, $x, $y) = @_;	388	my ($self, $hash, $x, $y) = @_;
…		…
252		528
253	unless ($id) {	529	unless ($id) {
254	# create new id for face	530	# create new id for face
255	# I love transactions	531	# I love transactions
256	for (1..100) {	532	for (1..100) {
257	my $txn = $CFClient::DB_ENV->txn_begin;	533	my $txn = $CFPlus::DB_ENV->txn_begin;
258	my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);	534	my $status = $self->{facemap}->db_get (id => $id);
259	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	535	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
260	$id = ($id \|\| 16) + 1;	536	$id = ($id \|\| 64) + 1;
261	if ($self->{facemap}->put (id => $id) == 0	537	if ($self->{facemap}->put (id => $id) == 0
262	&& $self->{facemap}->put ($hash => $id) == 0) {	538	&& $self->{facemap}->put ($hash => $id) == 0) {
263	$txn->txn_commit;	539	$txn->txn_commit;
264		540
265	goto gotid;	541	goto gotid;
266	}	542	}
267	}	543	}
268	$txn->abort;	544	$txn->txn_abort;
269	}	545	}
270		546
271	CFClient::fatal "maximum number of transaction retries reached - database problems?";	547	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
272	}	548	}
273		549
274	gotid:	550	gotid:
275	$face->{id} = $id;	551	$face->{id} = $id;
276	$self->{map}->set_face ($facenum => $id);	552	$self->{map}->set_face ($facenum => $id);
…		…
287	undef	563	undef
288	};	564	};
289	}	565	}
290		566
291	sub face_update {	567	sub face_update {
292	my ($self, $facenum, $face) = @_;	568	my ($self, $facenum, $face, $changed) = @_;
293		569
294	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	570	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
295		571
296	$self->set_texture ($face->{id} => delete $face->{image});	572	$self->set_texture ($face->{id} => delete $face->{image});
297	}	573	}
298		574
299	sub set_texture {	575	sub set_texture {
300	my ($self, $id, $data) = @_;	576	my ($self, $id, $data) = @_;
301		577
302	$self->{texture}[$id] \|\|= do {	578	$self->{texture}[$id] \|\|= do {
303	my $tex =	579	my $tex =
304	new_from_image CFClient::Texture	580	new_from_image CFPlus::Texture
305	$data, minify => 1, mipmap => 1;	581	$data, minify => 1, mipmap => 1;
306		582
307	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	583	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
308	$self->{map_widget}->update;	584	$self->{map_widget}->update;
309		585
…		…
323	my ($self, $flags, $prompt) = @_;	599	my ($self, $flags, $prompt) = @_;
324		600
325	$prompt = $LAST_QUERY unless length $prompt;	601	$prompt = $LAST_QUERY unless length $prompt;
326	$LAST_QUERY = $prompt;	602	$LAST_QUERY = $prompt;
327		603
328	my $dialog = new CFClient::UI::FancyFrame	604	$self->{query}-> ($self, $flags, $prompt);
329	title => "Query",
330	child => my $vbox = new CFClient::UI::VBox;
331
332	$vbox->add (new CFClient::UI::Label
333	max_w => $::WIDTH * 0.4,
334	ellipsise => 0,
335	text => $prompt);
336
337	if ($flags & CS_QUERY_YESNO) {
338	$vbox->add (my $hbox = new CFClient::UI::HBox);
339	$hbox->add (new CFClient::UI::Button
340	text => "No",
341	connect_activate => sub {
342	$self->send ("reply n");
343	$dialog->destroy;
344	$self->{map_widget}->focus_in;
345	}
346	);
347	$hbox->add (new CFClient::UI::Button
348	text => "Yes",
349	connect_activate => sub {
350	$self->send ("reply y");
351	$dialog->destroy;
352	},
353	);
354
355	$dialog->focus_in;
356
357	} elsif ($flags & CS_QUERY_SINGLECHAR) {
358	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
359	$vbox->add (my $entry = new CFClient::UI::Entry
360	connect_changed => sub {
361	$self->send ("reply $_[1]");
362	$dialog->destroy;
363	},
364	);
365
366	$entry->focus_in;
367
368	} else {
369	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
370
371	$vbox->add (my $entry = new CFClient::UI::Entry
372	$flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
373	connect_activate => sub {
374	$self->send ("reply $_[1]");
375	$dialog->destroy;
376	},
377	);
378
379	$entry->focus_in;
380	}
381
382	$dialog->show_centered;
383	}	605	}
384		606
385	sub drawinfo {	607	sub drawinfo {
386	my ($self, $color, $text) = @_;	608	my ($self, $color, $text) = @_;
387		609
…		…
394	[0.11, 0.56, 1.00],	616	[0.11, 0.56, 1.00],
395	[0.93, 0.46, 0.00],	617	[0.93, 0.46, 0.00],
396	[0.18, 0.54, 0.34],	618	[0.18, 0.54, 0.34],
397	[0.56, 0.73, 0.56],	619	[0.56, 0.73, 0.56],
398	[0.80, 0.80, 0.80],	620	[0.80, 0.80, 0.80],
399	[0.55, 0.41, 0.13],	621	[0.75, 0.61, 0.20],
400	[0.99, 0.77, 0.26],	622	[0.99, 0.77, 0.26],
401	[0.74, 0.65, 0.41],	623	[0.74, 0.65, 0.41],
402	);	624	);
403		625
404	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	626	$self->logprint ("info: ", $text);
405		627
406	$text = CFClient::UI::Label::escape $text;	628	# try to create single paragraphs of multiple lines sent by the server
		629	$text =~ s/(?<=\S)\n(?=\w)/ /g;
		630
		631	$text = CFPlus::asxml $text;
407	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	632	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
408	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	633	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
409		634
410	$self->{logview}->add_paragraph ($color[$color],	635	::message ({ fg => $color[$color], markup => $_ })
411	join "\n", map "$time $_", split /\n/, $text);	636	for split /\n/, $text;
412		637
413	$self->{statusbox}->add ($text,	638	$self->{statusbox}->add ($text,
414	group => $text,	639	group => $text,
415	fg => $color[$color],	640	fg => $color[$color],
416	timeout => 10,	641	timeout => $color >= 2 ? 180 : 10,
417	tooltip_font => $::FONT_FIXED,	642	tooltip_font => $::FONT_FIXED,
418	);	643	);
419	}	644	}
420		645
421	sub drawextinfo {	646	sub drawextinfo {
…		…
425	}	650	}
426		651
427	sub spell_add {	652	sub spell_add {
428	my ($self, $spell) = @_;	653	my ($self, $spell) = @_;
429		654
430	# TODO	655	# try to create single paragraphs out of the multiple lines sent by the server
431	# create a widget dynamically, using spell face (CF::Protocol downloads them)	656	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		657	$spell->{message} =~ s/\n+$//;
		658	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		659
		660	$::SPELL_PAGE->add_spell ($spell);
		661
432	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	662	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
433	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	663	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
434	}	664	}
435		665
436	sub spell_delete {	666	sub spell_delete {
437	my ($self, $spell) = @_;	667	my ($self, $spell) = @_;
		668
		669	$::SPELL_PAGE->remove_spell ($spell);
438	}	670	}
439		671
440	sub addme_success {	672	sub addme_success {
441	my ($self) = @_;	673	my ($self) = @_;
442		674
443	$self->send ("command output-sync $::CFG->{output_sync}");
444	$self->send ("command output-count $::CFG->{output_count}");
445
446	my $parser = new Pod::POM;
447	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448
449	my %skill_tooltip;	675	my %skill_help;
450		676
451	for my $head2 ($pod->head1->[-2]->head2) {	677	for my $node (CFPlus::Pod::find skill_description => "*") {
452	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;	678	my (undef, @par) = CFPlus::Pod::section_of $node;
		679	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
453	}	680	};
454		681
455	for my $skill (values %{$self->{skill_info}}) {	682	for my $skill (values %{$self->{skill_info}}) {
456	$self->{map_widget}->add_command ("ready_skill $skill",	683	$self->{map_widget}->add_command ("ready_skill $skill",
457	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	684	(CFPlus::asxml "Ready the skill '$skill'\n\n")
458	. $skill_tooltip{$skill});	685	. $skill_help{$skill});
459	$self->{map_widget}->add_command ("use_skill $skill",	686	$self->{map_widget}->add_command ("use_skill $skill",
460	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	687	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
461	. $skill_tooltip{$skill});	688	. $skill_help{$skill});
462	}	689	}
463	}	690	}
464		691
465	sub eof {	692	sub eof {
466	my ($self) = @_;	693	my ($self) = @_;
…		…
490		717
491	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	718	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
492		719
493	$self->send ("requestinfo image_sums $face $face");	720	$self->send ("requestinfo image_sums $face $face");
494		721
495	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	722	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
496	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	723	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
497	} elsif (!exists $self->{num_faces}) {	724	} elsif (!exists $self->{num_faces}) {
498	$self->send ("requestinfo image_info");	725	$self->send ("requestinfo image_info");
499		726
500	$self->{num_faces} = 0;	727	$self->{num_faces} = 0;
501		728
502	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	729	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
503	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	730	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
504	}	731	}
505	}	732	}
506		733
507	sub update_floorbox {	734	sub update_floorbox {
508	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	735	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
509	return unless $::CONN;	736	return unless $::CONN;
510		737
511	$::FLOORBOX->clear;	738	$::FLOORBOX->clear;
512		739
513	my $row;	740	my $row;
514	for (@{ $::CONN->{container}{0} }) {	741	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
515	if ($row < 7) {	742	if ($row < 6) {
516	local $_->{face_widget}; # hack to force recreation of widget	743	local $_->{face_widget}; # hack to force recreation of widget
517	local $_->{desc_widget}; # hack to force recreation of widget	744	local $_->{desc_widget}; # hack to force recreation of widget
518	CFClient::Item::update_widgets $_;	745	CFPlus::Item::update_widgets $_;
519		746
520	$::FLOORBOX->add (0, $row, $_->{face_widget});	747	$::FLOORBOX->add (0, $row, $_->{face_widget});
521	$::FLOORBOX->add (1, $row, $_->{desc_widget});	748	$::FLOORBOX->add (1, $row, $_->{desc_widget});
522		749
523	$row++;	750	$row++;
524	} else {	751	} else {
525	$::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");	752	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button
		753	text => "More...",
		754	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
		755	);
526	last;	756	last;
527	}	757	}
528	}	758	}
		759	if ($::CONN->{open_container}) {
		760	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
		761	text => "Close container",
		762	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		763	);
		764	}
529	});	765	});
530		766
531	$::WANT_REFRESH++;	767	$::WANT_REFRESH++;
532	}	768	}
533		769
534	sub set_opencont {	770	sub set_opencont {
535	my ($conn, $tag, $name) = @_;	771	my ($conn, $tag, $name) = @_;
536	$conn->{open_container} = $tag;	772	$conn->{open_container} = $tag;
537	$::INVR_LBL->set_text ($name);	773	update_floorbox;
		774
		775	$::INV_RIGHT_HB->clear ();
		776	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
		777
		778	if ($tag != 0) { # Floor isn't closable, is it?
		779	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
		780	text => "Close container",
		781	tooltip => "Close the currently open container (if one is open)",
		782	on_activate => sub {
		783	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
		784	if $tag != 0;
		785	#if $CONN->{open_container} != 0;
		786	0
		787	},
		788	);
		789	}
		790
538	$::INVR->set_items ($conn->{container}{$tag});	791	$::INVR->set_items ($conn->{container}{$tag});
539	}	792	}
540		793
541	sub update_container {	794	sub update_containers {
542	my ($tag) = @_;	795	my ($self) = @_;
543		796
544	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	797	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		798	my $todo = delete $self->{update_container}
		799	or return;
		800
		801	for my $tag (keys %$todo) {
		802	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		803	if ($tag == 0) {
		804	$::INVR->set_items ($self->{container}{0})
545	if $tag == $::CONN->{open_container};	805	if $tag == $self->{open_container};
		806	} elsif ($tag == $self->{player}{tag}) {
		807	$::INV->set_items ($self->{container}{$tag})
		808	} else {
		809	$::INVR->set_items ($self->{container}{$tag})
		810	if $tag == $self->{open_container};
		811	}
		812	}
		813	});
546	}	814	}
547		815
548	sub container_add {	816	sub container_add {
549	my ($self, $tag, $items) = @_;	817	my ($self, $tag, $items) = @_;
550		818
551	#d# print "container_add: container $tag ($self->{player}{tag})\n";	819	$self->{update_container}{$tag}++;
552		820	$self->update_containers;
553	if ($tag == 0) {
554	update_floorbox;
555	update_container (0);
556	} elsif ($tag == $self->{player}{tag}) {
557	$::INV->set_items ($self->{container}{$self->{player}{tag}})
558	} else {
559	update_container ($tag);
560	}
561
562	# $self-<{player}{tag} => player inv
563	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
564	}	821	}
565		822
566	sub container_clear {	823	sub container_clear {
567	my ($self, $tag) = @_;	824	my ($self, $tag) = @_;
568		825
569	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	826	$self->{update_container}{$tag}++;
570		827	$self->update_containers;
571	if ($tag == 0) {
572	update_floorbox;
573	update_container (0);
574	} elsif ($tag == $self->{player}{tag}) {
575	$::INV->set_items ($self->{container}{$tag})
576	}
577
578	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
579	}	828	}
580		829
581	sub item_delete {	830	sub item_delete {
582	my ($self, @items) = @_;	831	my ($self, @items) = @_;
583		832
		833	$self->{update_container}{$_->{container}}++
584	for (@items) {	834	for @items;
585	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
586
587	if ($_->{container} == 0) {
588	update_floorbox;
589	update_container ($_->{tag});
590	} elsif ($_->{container} == $self->{player}{tag}) {
591	$::INV->set_items ($self->{container}{$self->{player}{tag}})
592	} else {
593	update_container ($_->{tag});
594	}
595	}	835
		836	$self->update_containers;
596	}	837	}
597		838
598	sub item_update {	839	sub item_update {
599	my ($self, $item) = @_;	840	my ($self, $item) = @_;
600		841
601	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	842	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
602		843
603	if ($item->{tag} == $self->{player}{tag}) {
604	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
605	return;
606	}
607
608	CFClient::Item::update_widgets $item;	844	CFPlus::Item::update_widgets $item;
609		845
610	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	846	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
611	set_opencont ($::CONN, 0, "Floor");	847	set_opencont ($::CONN, 0, "Floor");
612		848
613	} elsif ($item->{flags} & F_OPEN) {	849	} elsif ($item->{flags} & F_OPEN) {
614	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	850	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
		851
615	} else {	852	} else {
616	if ($item->{container} == 0) {	853	$self->{update_container}{$item->{container}}++;
617	update_floorbox;
618	update_container (0);	854	$self->update_containers;
619	} elsif ($item->{container} == $self->{player}{tag}) {
620	$::INV->set_items ($self->{container}{$item->{container}})
621	}
622	}	855	}
623	}	856	}
624		857
625	sub player_update {	858	sub player_update {
626	my ($self, $player) = @_;	859	my ($self, $player) = @_;
		860
		861	$self->update_weight;
		862	}
		863
		864	sub update_weight {
		865	my ($self) = @_;
		866
		867	my $weight = .001 * $self->{player}{weight};
		868	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		869
627	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	870	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		871	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		872	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
628	}	873	}
629		874
630	1;	875	sub update_server_info {
		876	my ($self) = @_;
		877
		878	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		879
		880	$::SERVER_INFO->set_markup (
		881	"server <tt>$self->{host}:$self->{port}</tt>\n"
		882	. "protocol version <tt>$self->{version}</tt>\n"
		883	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		884	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		885	. "editing support $yesno[!!$self->{editor_support}]\n"
		886	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		887	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		888	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		889	. "map size $self->{mapw}×$self->{maph}\n"
		890	);
		891	}
		892
		893	sub logged_in {
		894	my ($self) = @_;
		895
		896	$self->send_ext_req (cfplus_support => version => 1, sub {
		897	$self->{cfplus_ext} = $_[0]{version};
		898	$self->update_server_info;
		899
		900	if ($self->{cfplus_ext} >= 2) {
		901	$self->send_ext_req ("editor_support", sub {
		902	$self->{editor_support} = $_[0];
		903	$self->update_server_info;
		904
		905	0
		906	});
		907	}
		908
		909	0
		910	});
		911
		912	$self->update_server_info;
		913
		914	$self->send_command ("output-sync $::CFG->{output_sync}");
		915	$self->send_command ("output-count $::CFG->{output_count}");
		916	$self->send_command ("pickup $::CFG->{pickup}");
		917	}
		918
		919	sub lookat {
		920	my ($self, $x, $y) = @_;
		921
		922	if ($self->{cfplus_ext}) {
		923	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {
		924	my ($msg) = @_;
		925
		926	if (exists $msg->{npc_dialog}) {
		927	# start npc chat dialog
		928	$self->{npc_dialog} = new CFPlus::NPCDialog::
		929	dx => $x,
		930	dy => $y,
		931	title => "$msg->{npc_dialog} (NPC)",
		932	conn => $self,
		933	;
		934	}
		935	});
		936	}
		937
		938	$self->send ("lookat $x $y");
		939	}
		940
		941	sub destroy {
		942	my ($self) = @_;
		943
		944	(delete $self->{npc_dialog})->destroy
		945	if $self->{npc_dialog};
		946
		947	$self->SUPER::destroy;
		948	}
		949
		950	package CFPlus::NPCDialog;
		951
		952	our @ISA = 'CFPlus::UI::Toplevel';
		953
		954	sub new {
		955	my $class = shift;
		956
		957	my $self = $class->SUPER::new (
		958	x => 'center',
		959	y => 'center',
		960	name => "npc_dialog",
		961	force_w => $::WIDTH * 0.7,
		962	force_h => $::HEIGHT * 0.7,
		963	title => "NPC Dialog",
		964	kw => { hi => 0, yes => 0, no => 0 },
		965	has_close_button => 1,
		966	@_,
		967	);
		968
		969	Scalar::Util::weaken (my $this = $self);
		970
		971	$self->connect (delete => sub { $this->destroy; 1 });
		972
		973	# better use a pane...
		974	$self->add (my $hbox = new CFPlus::UI::HBox);
		975	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
		976
		977	$hbox->add (my $vbox = new CFPlus::UI::VBox);
		978
		979	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
		980	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
		981	tooltip => "#npc_message_entry",
		982	on_activate => sub {
		983	my ($entry, $text) = @_;
		984
		985	return unless $text =~ /\S/;
		986
		987	$entry->set_text ("");
		988	$this->send ($text);
		989
		990	0
		991	},
		992	);
		993
		994	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
		995
		996	$self->{bye_button} = new CFPlus::UI::Button
		997	text => "Bye (close)",
		998	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		999	on_activate => sub { $this->destroy; 1 },
		1000	;
		1001
		1002	$self->update_options;
		1003
		1004	$self->{id} = $self->{conn}->send_ext_req (
		1005	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
		1006	sub { $this && $this->feed (@_) }
		1007	);
		1008
		1009	$self->{entry}->grab_focus;
		1010
		1011	$self->{textview}->add_paragraph ({
		1012	fg => [1, 1, 0, 1],
		1013	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1014	});
		1015
		1016	$self->show;
		1017	$self
		1018	};
		1019
		1020	sub update_options {
		1021	my ($self) = @_;
		1022
		1023	Scalar::Util::weaken $self;
		1024
		1025	$self->{options}->clear;
		1026	$self->{options}->add ($self->{bye_button});
		1027
		1028	for my $kw (sort keys %{ $self->{kw} }) {
		1029	$self->{options}->add (new CFPlus::UI::Button
		1030	text => $kw,
		1031	on_activate => sub {
		1032	$self->send ($kw);
		1033	0
		1034	},
		1035	);
		1036	}
		1037	}
		1038
		1039	sub feed {
		1040	my ($self, $msg) = @_;
		1041
		1042	Scalar::Util::weaken $self;
		1043
		1044	if ($msg->{msgtype} eq "reply") {
		1045	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};
		1046	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};
		1047
		1048	my $text = "\n" . CFPlus::asxml $msg->{msg};
		1049	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1050	my @link;
		1051	$text =~ s{
		1052	($match)
		1053	}{
		1054	my $kw = $1;
		1055
		1056	push @link, new CFPlus::UI::Label
		1057	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1058	can_hover => 1,
		1059	can_events => 1,
		1060	padding_x => 0,
		1061	padding_y => 0,
		1062	on_button_up => sub {
		1063	$self->send ($kw);
		1064	};
		1065
		1066	"\x{fffc}"
		1067	}giex;
		1068
		1069	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
		1070	$self->{textview}->scroll_to_bottom;
		1071	$self->update_options;
		1072	} else {
		1073	$self->destroy;
		1074	}
		1075
		1076	1
		1077	}
		1078
		1079	sub send {
		1080	my ($self, $msg) = @_;
		1081
		1082	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
		1083	$self->{textview}->scroll_to_bottom;
		1084
		1085	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
		1086	}
		1087
		1088	sub destroy {
		1089	my ($self) = @_;
		1090
		1091	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		1092
		1093	if ($self->{conn}) {
		1094	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
		1095	delete $self->{conn}{npc_dialog};
		1096	$self->{conn}->disconnect_ext ($self->{id});
		1097	}
		1098
		1099	$self->SUPER::destroy;
		1100	}
		1101
		1102	1
		1103

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC vs. Revision 1.86 by root, Sun Oct 8 21:22:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:22:30 2006 UTC