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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.46 by root, Mon Apr 24 10:19:39 2006 UTC vs.
Revision 1.86 by elmex, Fri Jun 2 16:27:27 2006 UTC

…		…
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFClient", $VERSION;
22	}	22	}
23		23
		24	use utf8;
		25
24	use Carp ();	26	use Carp ();
25	use AnyEvent;	27	use AnyEvent ();
26	use BerkeleyDB;	28	use BerkeleyDB;
27	use CFClient::OpenGL;
28
29	our %GL_EXT;
30	our $GL_VERSION;
31
32	our $GL_NPOT;
33
34	sub gl_init {
35	$GL_VERSION = gl_version * 1;
36	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
37
38	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
39
40	glEnable GL_TEXTURE_2D;
41	glEnable GL_COLOR_MATERIAL;
42	glShadeModel GL_FLAT;
43	glDisable GL_DEPTH_TEST;
44	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
45
46	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
47
48	CFClient::Texture::restore_state ();
49	}
50		29
51	sub find_rcfile($) {	30	sub find_rcfile($) {
52	my $path;	31	my $path;
53		32
54	for (grep !ref, @INC) {	33	for (grep !ref, @INC) {
…		…
89	}	68	}
90		69
91	close CFG;	70	close CFG;
92	}	71	}
93		72
94	mkdir "$Crossfire::VARDIR/pclient", 0777;	73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
95		74
		75	our $DB_ENV;
		76
		77	{
		78	use strict;
		79
		80	my $recover = $BerkeleyDB::db_version >= 4.4
		81	? eval "DB_REGISTER \| DB_RECOVER"
		82	: 0;
		83
96	our $DB_ENV = new BerkeleyDB::Env	84	$DB_ENV = new BerkeleyDB::Env
97	-Home => "$Crossfire::VARDIR/pclient",	85	-Home => "$Crossfire::VARDIR/cfplus",
98	-Cachesize => 1_000_000,	86	-Cachesize => 1_000_000,
99	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	87	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
100	# -ErrPrefix => "DATABASE",	88	# -ErrPrefix => "DATABASE",
101	-Verbose => 1,	89	-Verbose => 1,
102	-Flags => DB_CREATE \| DB_RECOVER_FATAL \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	90	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		91	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
103	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	92	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		93	}
104		94
105	sub db_table($) {	95	sub db_table($) {
106	my ($table) = @_;	96	my ($table) = @_;
107		97
108	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	98	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
109		99
110	new CFClient::Database	100	new CFClient::Database
111	-Env => $DB_ENV,	101	-Env => $DB_ENV,
112	-Filename => $table,	102	-Filename => $table,
113	# -Filename => "database",	103	# -Filename => "database",
114	# -Subname => $table,	104	# -Subname => $table,
		105	-Property => DB_CHKSUM,
115	-Flags => DB_CREATE \| DB_UPGRADE,	106	-Flags => DB_CREATE \| DB_UPGRADE,
116	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	107	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
		108	}
		109
		110	sub pod_to_pango($) {
		111	my ($pom) = @_;
		112
		113	$pom->present ("CFClient::PodToPango")
		114	}
		115
		116	sub pod_to_pango_list($) {
		117	my ($pom) = @_;
		118
		119	[
		120	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
		121	split /\n/, $pom->present ("CFClient::PodToPango")
		122	]
		123	}
		124
		125	package CFClient::PodToPango;
		126
		127	use base Pod::POM::View::Text;
		128
		129	our $indent = 0;
		130
		131	*view_seq_code =
		132	*view_seq_bold = sub { "<b>$_[1]</b>" };
		133	*view_seq_italic = sub { "<i>$_[1]</i>" };
		134	*view_seq_space =
		135	*view_seq_link =
		136	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		137
		138	sub view_seq_text {
		139	my $text = $_[1];
		140	$text =~ s/\s+/ /g;
		141	CFClient::UI::Label::escape ($text)
		142	}
		143
		144	sub view_item {
		145	("\t" x ($indent / 4))
		146	. $_[1]->title->present ($_[0])
		147	. "\n"
		148	. $_[1]->content->present ($_[0])
		149	}
		150
		151	sub view_verbatim {
		152	(join "",
		153	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		154	split /\n/, CFClient::UI::Label::escape ($_[1]))
		155	. "\n"
		156	}
		157
		158	sub view_textblock {
		159	("\t" x ($indent / 2)) . "$_[1]\n\n"
		160	}
		161
		162	sub view_head1 {
		163	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		164	. $_[1]->content->present ($_[0])
		165	};
		166
		167	sub view_head2 {
		168	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		169	. $_[1]->content->present ($_[0])
		170	};
		171
		172	sub view_head3 {
		173	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		174	. $_[1]->content->present ($_[0])
		175	};
		176
		177	sub view_over {
		178	local $indent = $indent + $_[1]->indent;
		179	$_[1]->content->present ($_[0])
117	}	180	}
118		181
119	package CFClient::Database;	182	package CFClient::Database;
120		183
121	our @ISA = BerkeleyDB::Btree::;	184	our @ISA = BerkeleyDB::Btree::;
…		…
136	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });	199	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
137		200
138	$db->db_put ($key => $data)	201	$db->db_put ($key => $data)
139	}	202	}
140		203
141	package CFClient::Texture;	204	package CFClient::Item;
142		205
143	use strict;	206	use strict;
		207	use Crossfire::Protocol::Constants;
144		208
145	use Scalar::Util;	209	my $last_enter_count = 1;
146		210
147	use CFClient::OpenGL;	211	sub desc_string {
148
149	my %TEXTURES;
150
151	sub new {
152	my ($class, %data) = @_;
153
154	my $self = bless {
155	internalformat => GL_RGBA,
156	format => GL_RGBA,
157	type => GL_UNSIGNED_BYTE,
158	%data,
159	}, $class;
160
161	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
162
163	$self->upload;
164
165	$self
166	}
167
168	sub new_from_image {
169	my ($class, $image, %arg) = @_;
170
171	$class->new (image => $image, %arg)
172	}
173
174	sub new_from_file {
175	my ($class, $path, %arg) = @_;
176
177	open my $fh, "<:raw", $path
178	or die "$path: $!";
179
180	local $/;
181	$class->new_from_image (<$fh>, %arg)
182	}
183
184	#sub new_from_surface {
185	# my ($class, $surface) = @_;
186	#
187	# $surface->rgba;
188	#
189	# $class->new (
190	# data => $surface->pixels,
191	# w => $surface->width,
192	# h => $surface->height,
193	# )
194	#}
195
196	sub new_from_layout {
197	my ($class, $layout, %arg) = @_;
198
199	my ($w, $h, $data) = $layout->render;
200
201	$class->new (
202	w => $w,
203	h => $h,
204	data => $data,
205	format => GL_ALPHA,
206	internalformat => GL_ALPHA,
207	type => GL_UNSIGNED_BYTE,
208	%arg,
209	)
210	}
211
212	sub new_from_opengl {
213	my ($class, $w, $h, $cb) = @_;
214
215	$class->new (w => $w, h => $h, render_cb => $cb)
216	}
217
218	sub topot {
219	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
220	}
221
222	sub upload {
223	my ($self) = @_;	212	my ($self) = @_;
224		213
225	return unless $GL_VERSION;	214	my $desc =
		215	$self->{nrof} < 2
		216	? $self->{name}
		217	: "$self->{nrof} × $self->{name_pl}";
226		218
227	my $data;	219	$self->{flags} & F_OPEN
		220	and $desc .= " (open)";
		221	$self->{flags} & F_APPLIED
		222	and $desc .= " (applied)";
		223	$self->{flags} & F_UNPAID
		224	and $desc .= " (unpaid)";
		225	$self->{flags} & F_MAGIC
		226	and $desc .= " (magic)";
		227	$self->{flags} & F_CURSED
		228	and $desc .= " (cursed)";
		229	$self->{flags} & F_DAMNED
		230	and $desc .= " (damned)";
		231	$self->{flags} & F_LOCKED
		232	and $desc .= " *";
228		233
229	if (exists $self->{data}) {	234	$desc
230	$data = $self->{data};	235	}
231		236
232	} elsif (exists $self->{render_cb}) {	237	sub weight_string {
233	glViewport 0, 0, $self->{w}, $self->{h};	238	my ($self) = @_;
234	glMatrixMode GL_PROJECTION;
235	glLoadIdentity;
236	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
237	glMatrixMode GL_MODELVIEW;
238	glLoadIdentity;
239	$self->{render_cb}->($self, $self->{w}, $self->{h});
240		239
241	} else {	240	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
242	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
243	= CFClient::load_image_inline $self->{image};
244	}
245		241
246	my ($tw, $th) = @$self{qw(w h)};	242	$weight < 0 ? "?" : $weight * 0.001
		243	}
247		244
248	unless ($tw && $th) {	245	sub do_n_dialog {
249	$tw = $th = 1;	246	my ($cb) = @_;
250	$data = "\x00" x 64;
251	}
252		247
253	$self->{minified} = [CFClient::average $tw, $th, $data]	248	my $w = new CFClient::UI::FancyFrame;
254	if $self->{minify};	249	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
255		250	$vb->add (new CFClient::UI::Label text => "Enter item count:");
256	unless ($GL_NPOT) {	251	$vb->add (my $entry = new CFClient::UI::Entry
257	# TODO: does not work for zero-sized textures	252	text => $last_enter_count,
258	$tw = topot $tw;	253	on_activate => sub {
259	$th = topot $th;	254	my ($entry) = @_;
260		255	$last_enter_count = $entry->get_text;
261	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	256	$cb->($last_enter_count);
262	my $bpp = (length $data) / ($self->{w} * $self->{h});	257	$w->hide;
263	$data = pack "(a" . ($tw * $bpp) . ")*",	258	$w = undef;
264	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
265	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
266	}	259	}
		260	);
		261	$entry->focus_in;
		262	$w->show;
		263
		264	}
		265
		266	sub update_widgets {
		267	my ($self) = @_;
		268
		269	my $button_cb = sub {
		270	my (undef, $ev, $x, $y) = @_;
		271
		272	my $targ = $::CONN->{player}{tag};
		273
		274	if ($self->{container} == $::CONN->{player}{tag}) {
		275	$targ = $::CONN->{open_container};
		276	}
		277
		278	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		279	$::CONN->send ("move $targ $self->{tag} 0")
		280	if $targ \|\| !($self->{flags} & F_LOCKED);
		281	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		282	$self->{flags} & F_LOCKED
		283	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		284	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
		285	} elsif ($ev->{button} == 1) {
		286	$::CONN->send ("examine $self->{tag}");
		287	} elsif ($ev->{button} == 2) {
		288	$::CONN->send ("apply $self->{tag}");
		289	} elsif ($ev->{button} == 3) {
		290	my @menu_items = (
		291	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
		292	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		293	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
		294	(
		295	$self->{flags} & F_LOCKED
		296	? (
		297	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
		298	)
		299	: (
		300	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
		301	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		302	["move n",
		303	sub {
		304	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		305	}
		306	]
		307	)
		308	),
		309	);
		310
		311	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		312	}
		313
		314	1
267	}	315	};
268		316
269	$self->{s} = $self->{w} / $tw;	317	my $tooltip_std = "<small>"
270	$self->{t} = $self->{h} / $th;	318	. "Left click - examine item\n"
		319	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
		320	. "Middle click - apply\n"
		321	. "Shift-Middle click - lock/unlock\n"
		322	. "Right click - further options"
		323	. "</small>\n";
271		324
272	$self->{name} \|\|= glGenTexture;	325	$self->{face_widget} \|\|= new CFClient::UI::Face
273		326	can_events => 1,
274	glBindTexture GL_TEXTURE_2D, $self->{name};	327	can_hover => 1,
275		328	anim => $self->{anim},
276	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	329	animspeed => $self->{animspeed}, # TODO# must be set at creation time
277	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	330	on_button_down => $button_cb,
278
279	if ($::FAST) {
280	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
281	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
282	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
283	# alternatively check for 0x8191
284	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
285	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
287	} else {
288	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
289	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
290	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
291	}	331	;
		332	$self->{face_widget}{face} = $self->{face};
		333	$self->{face_widget}{anim} = $self->{anim};
		334	$self->{face_widget}{animspeed} = $self->{animspeed};
		335	$self->{face_widget}->set_tooltip (
		336	"<b>Face/Animation.</b>\n"
		337	. "Item uses face #$self->{face}. "
		338	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
		339	. "\n\n$tooltip_std"
		340	);
292		341
293	glGetError;	342	$self->{desc_widget} \|\|= new CFClient::UI::Label
		343	can_events => 1,
		344	can_hover => 1,
		345	ellipsise => 2,
		346	align => -1,
		347	on_button_down => $button_cb,
		348	;
		349	my $desc = CFClient::Item::desc_string $self;
		350	$self->{desc_widget}->set_text ($desc);
		351	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
294		352
295	if (defined $data) {	353	$self->{weight_widget} \|\|= new CFClient::UI::Label
296	glTexImage2D GL_TEXTURE_2D, 0,	354	can_events => 1,
297	$self->{internalformat},	355	can_hover => 1,
298	$tw, $th, # need to pad texture first	356	ellipsise => 0,
299	0,	357	align => 0,
300	$self->{format},	358	on_button_down => $button_cb,
301	$self->{type},	359	;
302	$data;	360	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
303	if (my $error = glGetError) {	361
304	Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",	362	$self->{weight_widget}->set_tooltip (
305	$error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};	363	"<b>Weight</b>.\n"
		364	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
		365	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		366	. "\n\n$tooltip_std"
		367	);
		368	}
		369
		370	package CFClient::Binder;
		371
		372	my @ALLOWED_MODIFIER_KEYS = (
		373	CFClient::SDLK_LSHIFT,
		374	CFClient::SDLK_LCTRL ,
		375	CFClient::SDLK_LALT ,
		376	CFClient::SDLK_LMETA ,
		377
		378	CFClient::SDLK_RSHIFT,
		379	CFClient::SDLK_RCTRL ,
		380	CFClient::SDLK_RALT ,
		381	CFClient::SDLK_RMETA ,
		382	);
		383
		384	my %ALLOWED_MODIFIERS = (
		385	CFClient::KMOD_LSHIFT => "LSHIFT",
		386	CFClient::KMOD_LCTRL => "LCTRL",
		387	CFClient::KMOD_LALT => "LALT",
		388	CFClient::KMOD_LMETA => "LMETA",
		389
		390	CFClient::KMOD_RSHIFT => "RSHIFT",
		391	CFClient::KMOD_RCTRL => "RCTRL",
		392	CFClient::KMOD_RALT => "RALT",
		393	CFClient::KMOD_RMETA => "RMETA",
		394	);
		395
		396	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
		397	my @DIRECT_BIND_KEYS = (
		398	CFClient::SDLK_F1,
		399	CFClient::SDLK_F2,
		400	CFClient::SDLK_F3,
		401	CFClient::SDLK_F4,
		402	CFClient::SDLK_F5,
		403	CFClient::SDLK_F6,
		404	CFClient::SDLK_F7,
		405	CFClient::SDLK_F8,
		406	CFClient::SDLK_F9,
		407	CFClient::SDLK_F10,
		408	CFClient::SDLK_F11,
		409	CFClient::SDLK_F12,
		410	CFClient::SDLK_F13,
		411	CFClient::SDLK_F14,
		412	CFClient::SDLK_F15,
		413	);
		414
		415	# this binding dialog asks for a key-combo to be pressed
		416	# and if successful it calls the $cb with $mod and $sym as args.
		417	sub open_binding_dialog {
		418	my ($cb) = @_;
		419
		420	my $w = new CFClient::UI::FancyFrame
		421	title => "Bind Action",
		422	x => "center",
		423	y => "center";
		424
		425	$w->add (my $vb = new CFClient::UI::VBox);
		426	$vb->add (new CFClient::UI::Label
		427	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
		428	."You can only bind 0-9 and F1-F15 without modifiers."
		429	);
		430	$vb->add (my $entry = new CFClient::UI::Entry
		431	text => "",
		432	on_key_down => sub {
		433	my ($entry, $ev) = @_;
		434
		435	my $mod = $ev->{mod};
		436	my $sym = $ev->{sym};
		437
		438	# XXX: This seems a little bit hackisch to me, but i have to ignore them
		439	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
		440	return;
		441	}
		442
		443	if ($mod == CFClient::KMOD_NONE
		444	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
		445	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
		446	{
		447	$::STATUSBOX->add (
		448	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
		449	." directly without modifier! It would damage the completer handling."
		450	);
		451	return;
		452	}
		453
		454	$entry->focus_out;
		455
		456	$cb->($mod, $sym);
		457
		458	$w->destroy
306	}	459	});
307	} else {
308	glCopyTexImage2D GL_TEXTURE_2D, 0,
309	$self->{internalformat},
310	0, 0,
311	$tw, $th,
312	0;
313	if (my $error = glGetError) {
314	Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
315	$error, $tw, $th, $self->{internalformat};
316	}
317	}
318	}
319		460
320	sub DESTROY {	461	$entry->focus_in;
321	my ($self) = @_;	462	$w->show;
322
323	delete $TEXTURES{$self+0};
324
325	glDeleteTexture delete $self->{name}
326	if $self->{name};
327	}	463	}
328		464
329	sub restore_state{	465	sub keycombo_to_name {
330	$_->upload	466	my ($mod, $sym) = @_;
331	for values %TEXTURES;	467
332	};	468	my $mods = join '+',
		469	map { $ALLOWED_MODIFIERS{$_} }
		470	grep { ($_ + 0) & ($mod + 0) }
		471	keys %ALLOWED_MODIFIERS;
		472	$mods .= "+" if $mods ne '';
		473
		474	return $mods . CFClient::SDL_GetKeyName ($sym);
		475	}
		476
		477	package CFClient::Pickup;
		478	# some pickup constants
		479	sub PU_NOTHING { 0x00000000 }
		480
		481	sub PU_DEBUG { 0x10000000 }
		482	sub PU_INHIBIT { 0x20000000 }
		483	sub PU_STOP { 0x40000000 }
		484	sub PU_NEWMODE { 0x80000000 }
		485
		486	sub PU_RATIO { 0x0000000F }
		487
		488	sub PU_FOOD { 0x00000010 }
		489	sub PU_DRINK { 0x00000020 }
		490	sub PU_VALUABLES { 0x00000040 }
		491	sub PU_BOW { 0x00000080 }
		492
		493	sub PU_ARROW { 0x00000100 }
		494	sub PU_HELMET { 0x00000200 }
		495	sub PU_SHIELD { 0x00000400 }
		496	sub PU_ARMOUR { 0x00000800 }
		497
		498	sub PU_BOOTS { 0x00001000 }
		499	sub PU_GLOVES { 0x00002000 }
		500	sub PU_CLOAK { 0x00004000 }
		501	sub PU_KEY { 0x00008000 }
		502
		503	sub PU_MISSILEWEAPON { 0x00010000 }
		504	sub PU_ALLWEAPON { 0x00020000 }
		505	sub PU_MAGICAL { 0x00040000 }
		506	sub PU_POTION { 0x00080000 }
		507
		508	sub PU_SPELLBOOK { 0x00100000 }
		509	sub PU_SKILLSCROLL { 0x00200000 }
		510	sub PU_READABLES { 0x00400000 }
		511	sub PU_MAGIC_DEVICE { 0x00800000 }
		512
		513	sub PU_NOT_CURSED { 0x01000000 }
		514
		515	sub PU_JEWELS { 0x02000000 }
		516
333		517
334	1;	518	1;
335		519
336	=back	520	=back
337		521

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.46 by root, Mon Apr 24 10:19:39 2006 UTC vs. Revision 1.86 by elmex, Fri Jun 2 16:27:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.46 by root, Mon Apr 24 10:19:39 2006 UTC vs.
Revision 1.86 by elmex, Fri Jun 2 16:27:27 2006 UTC