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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.15 by root, Thu Jun 1 18:56:05 2006 UTC vs. Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.15 by root, Thu Jun 1 18:56:05 2006 UTC vs.
Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC