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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.55 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.88 by root, Mon Jun 5 05:31:13 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.55 by root, Fri May 19 16:43:56 2006 UTC vs. Revision 1.88 by root, Mon Jun 5 05:31:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.55 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.88 by root, Mon Jun 5 05:31:13 2006 UTC