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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.5 by elmex, Sat May 27 10:32:35 2006 UTC vs. Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.5 by elmex, Sat May 27 10:32:35 2006 UTC vs.
Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC