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