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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs. Revision 1.79 by root, Fri Aug 18 01:01:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.79 by root, Fri Aug 18 01:01:01 2006 UTC