[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.5 by root, Thu Mar 8 15:19:08 2007 UTC vs.
Revision 1.44 by root, Tue Jul 24 04:55:35 2007 UTC

…		…
6	my $exec_prefix = "@exec_prefix@";	6	my $exec_prefix = "@exec_prefix@";
7	my $datarootdir = "@datarootdir@";	7	my $datarootdir = "@datarootdir@";
8	my $DATADIR = "@datadir@/@PACKAGE@";	8	my $DATADIR = "@datadir@/@PACKAGE@";
9		9
10	my $CONVERT = "@CONVERT@";	10	my $CONVERT = "@CONVERT@";
11	my $IDENTIFY = "@IDENTIFY@";	11	#my $IDENTIFY = "@IDENTIFY@";
12	my $OPTIPNG = "@OPTIPNG@";	12	my $OPTIPNG = "@OPTIPNG@";
13	my $RSYNC = "@RSYNC@";	13	my $RSYNC = "@RSYNC@";
		14	my $PNGNQ = "@PNGNQ@";
14		15
15	use Getopt::Long;	16	use Getopt::Long;
16	use Coro::Event;	17	use Coro::Event;
17	use AnyEvent;	18	use AnyEvent;
18	use IO::AIO ();	19	use IO::AIO ();
19	use File::Temp;	20	use File::Temp;
20	use Crossfire;	21	use Crossfire;
21	use Coro;	22	use Coro;
22	use Coro::AIO;	23	use Coro::AIO;
23	use POSIX ();	24	use POSIX ();
		25	use Digest::MD5;
		26	use Carp;
		27	use Coro::Storable; $Storable::canonical = 1;
		28
		29	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
24		30
25	sub usage {	31	sub usage {
26	warn <<EOF;	32	warn <<EOF;
27	Usage: cfutil [-v] [-q] [--force] [--cache]	33	Usage: cfutil [-v] [-q] [--force] [--cache]
28	[--install-arch path]	34	[--install-arch path]
…		…
40	my $CACHE = 0;	46	my $CACHE = 0;
41	my $FORCE;	47	my $FORCE;
42	my $TMPDIR = "/tmp/cfutil$$~";	48	my $TMPDIR = "/tmp/cfutil$$~";
43	my $TMPFILE = "aaaa0";	49	my $TMPFILE = "aaaa0";
44		50
		51	our %COLOR = (
		52	black => 0,
		53	white => 1,
		54	navy => 2,
		55	red => 3,
		56	orange => 4,
		57	blue => 5,
		58	darkorange => 6,
		59	green => 7,
		60	lightgreen => 8,
		61	grey => 9,
		62	brown => 10,
		63	gold => 11,
		64	tan => 12,
		65	);
		66
45	END { system "rm", "-rf", $TMPDIR }	67	END { system "rm", "-rf", $TMPDIR }
46		68
47	Event->signal (signal => "INT", cb => sub { exit 1 });	69	Event->signal (signal => "INT", cb => sub { exit 1 });
48	Event->signal (signal => "TERM", cb => sub { exit 1 });	70	Event->signal (signal => "TERM", cb => sub { exit 1 });
49		71
…		…
66	}	88	}
67		89
68	sub inst_maps($) {	90	sub inst_maps($) {
69	my (undef, $path) = @_;	91	my (undef, $path) = @_;
70		92
71	print "installing '$path' to '$DATADIR/maps'\n\n";	93	print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
72		94
73	if (!-f "$path/regions") {	95	if (!-f "$path/regions") {
74	warn "'$path' does not look like a maps directory ('regions' file is missing).\n";	96	warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
75	exit 1 unless $FORCE;	97	exit 1 unless $FORCE;
76	}	98	}
77		99
78	system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded";	100	system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
		101	and die "map installation failed.\n";
		102
		103	print "maps installed successfully.\n";
79	}	104	}
80		105
81	{	106	{
82	our @PNG;	107	our %ANIMINFO;
		108	our %FACEINFO;
		109	our %RESOURCE;
83	our @ARC;	110	our @ARC;
		111	our %ARC;
		112	our $TRS;
84	our $NFILE;	113	our $NFILE;
85	our @FACE;
86	our $ANIM;	114	our $PATH;
87		115
		116	our $QUANTIZE = "+dither -colorspace RGB -colors 256";
		117
88	our (@png, @trs, @arc); # files we are interested in	118	our (@png, @trs, @arc, @res); # files we are interested in
89		119
90	sub commit_png {	120	sub commit_png($$$) {
91	my ($name, $data) = @_;	121	my ($name, $data, $T) = @_;
92		122
93	push @PNG, [$name => $data];	123	$FACEINFO{$name}{"data$T"} = $data;
94	}	124	}
95		125
96	sub process_png {	126	sub process_png {
97	while (@png) {	127	while (@png) {
98	my $path = pop @png;	128	my ($path, $delete) = @{pop @png};
99		129
100	my $png;	130	my $png;
101	aio_lstat $path;	131	aio_lstat $path;
102	my ($size, $mtime) = (stat _)[7,9];	132	my ($size, $mtime) = (stat _)[7,9];
103		133
104	if (0 > aio_load $path, $png) {	134	if (0 > aio_load $path, $png) {
105	warn "$path: $!, skipping.\n";	135	warn "$path: $!, skipping.\n";
106	next;	136	next;
107	}	137	}
108		138
109	# quickly extratc width and height of the (necessarily PNG) image	139	my $stem = $path;
110	unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {	140	my $T;
111	warn "$path: not a recongized png file, skipping.\n";
112	next;
113	}
114		141
115	my ($w, $h) = unpack "NN", $1;	142	if ($stem =~ s/\.32x32\.png~?$//) {
116
117	(my $face = $path) =~ s/^.*\///;
118	my $T = 32;	143	$T = 32;
119		144	} elsif ($stem =~ s/\.64x64\.png~?$//) {
120	unless ($face =~ s/\.base\.(...)\.png$/.$1/) {	145	$T = 64;
		146	} else {
121	warn "$path: weird filename, skipping.\n";	147	warn "$path: weird filename, skipping.\n";
122	next;	148	next;
123	}	149	}
		150
		151	# quickly extract width and height of the (necessarily PNG) image
		152	unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
		153	warn "$path: not a recognized png file, skipping.\n";
		154	next;
		155	}
		156
		157	my ($w, $h) = unpack "NN", $1;
124		158
125	if ($w < $T \|\| $h < $T) {	159	if ($w < $T \|\| $h < $T) {
126	warn "$path: too small ($w $h), skipping.\n";	160	warn "$path: too small ($w $h), skipping.\n";
127	next;	161	next;
128	}	162	}
…		…
130	if ($w % $T \|\| $h % $T) {	164	if ($w % $T \|\| $h % $T) {
131	warn "$path: weird png size ($w $h), skipping.\n";	165	warn "$path: weird png size ($w $h), skipping.\n";
132	next;	166	next;
133	}	167	}
134		168
		169	unless ($path =~ /~$/) {
		170	# possibly enlarge
		171	if (0 > aio_stat "$stem.64x64.png") {
		172	my $other = "$stem.64x64.png~";
		173
		174	if (0 > aio_lstat $other or (-M _) > (-M $path)) {
		175	my $wrap = 0; # for the time being
		176	fork_sub {
		177	system "convert png:\Q$path\E -depth 8 rgba:-"
		178	. "\| $exec_prefix/bin/cfhq2xa $w $h $wrap"
		179	. "\| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
		180	and die "convert/hq2xa pipeline error: status $? ($!)";
		181	system $OPTIPNG, "-i0", "-q", "$other~";
		182	die "$other~ has zero size, aborting." unless -s "$other~";
		183	rename "$other~", $other;
		184	};
		185	}
		186
		187	push @png, [$other, !$CACHE];
		188	}
		189
		190	# possibly scale down
		191	if (0 > aio_stat "$stem.32x32.png") {
		192	my $other = "$stem.32x32.png~";
		193
		194	if (0 > aio_lstat $other or (-M _) > (-M $path)) {
		195	fork_sub {
		196	system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
		197	system $OPTIPNG, "-i0", "-q", "$other~";
		198
		199	# reduce smoothfaces >10000 bytes
		200	if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
		201	my $ncolor = 256;
		202	while () {
		203	system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
		204	system $OPTIPNG, "-i0", "-q", "$other~~";
		205	last if 10000 > -s "$other~~";
		206	$ncolor = int $ncolor * 0.9;
		207	$ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
		208	}
		209
		210	printf "reduced %s from %d to %d bytes using %d colours.\n",
		211	$other, -s "$other~", -s "$other~~", $ncolor
		212	if $VERBOSE >= 2;
		213	rename "$other~~", "$other~";
		214	}
		215
		216	die "$other~ has zero size, aborting." unless -s "$other~";
		217	rename "$other~", $other;
		218	};
		219	}
		220
		221	#warn "scaled down $path to $other\n";#d#
		222	push @png, [$other, !$CACHE];
		223	}
		224	}
		225
		226	(my $face = $stem) =~ s/^.*\///;
		227
		228	# split all bigfaces, but avoid smoothfaces (*_S)
135	if (($w > $T \|\| $h > $T) && $face !~ /_S\./) {	229	if (($w > $T \|\| $h > $T) && $face !~ /_S\./) {
136	# split	230	# split
137	my @tile;	231	my @tile;
138	for my $x (0 .. (int $w / $T) - 1) {	232	for my $x (0 .. (int $w / $T) - 1) {
139	for my $y (0 .. (int $h / $T) - 1) {	233	for my $y (0 .. (int $h / $T) - 1) {
…		…
147	my @todo = grep { $_->[3] <= $mtime } @tile;	241	my @todo = grep { $_->[3] <= $mtime } @tile;
148	if (@todo) {	242	if (@todo) {
149	fork_sub {	243	fork_sub {
150	open my $convert, "\|-", $CONVERT,	244	open my $convert, "\|-", $CONVERT,
151	"png:-",	245	"png:-",
152	-negate,#d#
153	(map {	246	(map {
154	(	247	(
155	"(",	248	"(",
156	"+clone",	249	"+clone",
157	-crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),	250	-crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
		251	"+repage",
		252	-quality => "00",
158	-write => "png:$_->[2]~",	253	-write => "png32:$_->[2]~",
159	"+delete",	254	"+delete",
160	")",	255	")",
161	)	256	)
162	} @todo),	257	} @todo),
163	"null:";	258	"null:";
…		…
167	close $convert;	262	close $convert;
168		263
169	# pass 2, optimise, and rename	264	# pass 2, optimise, and rename
170	for (@todo) {	265	for (@todo) {
171	system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";	266	system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
		267	die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
172	rename "$_->[2]~", $_->[2];	268	rename "$_->[2]~", $_->[2];
173	}	269	}
174	};	270	};
175	}	271	}
176		272
…		…
180		276
181	if (0 > aio_load $file, $tile) {	277	if (0 > aio_load $file, $tile) {
182	die "$path: unable to read tile +$x+$y, aborting.\n";	278	die "$path: unable to read tile +$x+$y, aborting.\n";
183	}	279	}
184	IO::AIO::aio_unlink $file unless $CACHE;	280	IO::AIO::aio_unlink $file unless $CACHE;
185	commit_png $x\|$y ? "$face+$x+$y" : $face, $tile;	281	commit_png $x\|$y ? "$face+$x+$y" : $face, $tile, $T;
186	}	282	}
187	} else {	283	} else {
188	# use as-is (either small, use smooth)	284	# use as-is (either small, use smooth)
189	commit_png $face, $png;	285	commit_png $face, $png, $T;
190	}	286	}
		287
		288	aio_unlink $path if $delete;
191	}	289	}
192	}	290	}
193		291
194	sub process_arc {	292	sub process_arc {
195	while (@arc) {	293	while (@arc) {
…		…
199	aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/	297	aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
200		298
201	my $arc = read_arch "$dir/$file";	299	my $arc = read_arch "$dir/$file";
202	for my $o (values %$arc) {	300	for my $o (values %$arc) {
203	push @ARC, $o;	301	push @ARC, $o;
		302	for (my $m = $o; $m; $m = $m->{more}) {
		303	$ARC{$m->{_name}} = $m;
		304	}
		305
		306	$o->{editor_folder} = $dir;
		307
		308	my $visibility = delete $o->{visibility};
		309	my $magicmap = delete $o->{magicmap};
		310
		311	# find upper left corner :/
		312	# omg, this is sooo broken
204	my ($dx, $dy);	313	my ($dx, $dy);
205	# omg, this is sooo broken
206	for (my $o = $o; $o; $o = $o->{more}) {	314	for (my $o = $o; $o; $o = $o->{more}) {
207	$dx = $o->{x} if $o->{x} < $dx;	315	$dx = $o->{x} if $o->{x} < $dx;
208	$dy = $o->{y} if $o->{y} < $dy;	316	$dy = $o->{y} if $o->{y} < $dy;
209	}	317	}
		318
210	for (my $o = $o; $o; $o = $o->{more}) {	319	for (my $o = $o; $o; $o = $o->{more}) {
211	my $x = $o->{x} - $dx;	320	my $x = $o->{x} - $dx;
212	my $y = $o->{y} - $dy;	321	my $y = $o->{y} - $dy;
213	if ($x\|$y) {	322
214	$_ .= "+$x+$y" for $o->{face}, @{$o->{anim} \|\| []};	323	my $ext = $x\|$y ? "+$x+$y" : "";
215	}	324
216	}	325	$o->{face} .= $ext unless /^blank.x11$\|^empty.x11$/ \|\| !$o->{face};
		326
		327	$visibility = delete $o->{visibility} if exists $o->{visibility};
		328	$magicmap = delete $o->{magicmap} if exists $o->{magicmap};
		329
217	if (my $anim = delete $o->{anim}) {	330	my $anim = delete $o->{anim};
		331
		332	if ($anim) {
		333	# possibly add $ext to the animation name to avoid
		334	# the need to specify archnames for all parts
		335	# of a multipart archetype.
218	$o->{animation} = $o->{_name};	336	$o->{animation} = "$o->{_name}";
219	$ANIM .= join "", map "$_\n",	337	my $facings = 1;
220	"anim $o->{_name}",	338	my @frames;
		339
		340	for (@$anim) {
		341	if (/^facings\s+(\d+)/) {
		342	$facings = $1*1;
		343	} elsif (/^blank.x11$\|^empty.x11$/) {
		344	push @frames, $_;
		345	} else {
		346	push @frames, "$_$ext";
221	@$anim,	347	}
222	"mina";	348	}
		349
		350	$ANIMINFO{$o->{animation}} = {
		351	facings => $facings,
		352	frames => \@frames,
		353	};
		354	}
		355
		356	for my $face ($o->{face} \|\| (), @{$anim \|\| []}) {
		357	next if $face =~ /^facings\s\|^blank.x11$\|^empty.x11$/;
		358
		359	my $info = $FACEINFO{$face} \|\|= {};
		360
		361	$info->{visibility} = $visibility if defined $visibility;
		362	$info->{magicmap} = $magicmap if defined $magicmap;
		363	}
		364
		365	if (my $smooth = delete $o->{smoothface}) {
		366	my %kv =split /\s+/, $smooth;
		367	my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
		368	while (my ($face, $smooth) = each %kv) {
		369	$FACEINFO{$face}{smooth} = $smooth;
		370	$FACEINFO{$face}{smoothlevel} = $level;
		371	}
		372	}
223	}	373	}
224	}	374	}
225	}	375	}
226	}	376	}
227		377
228	sub process_trs {	378	sub process_trs {
229	while (@trs) {	379	while (@trs) {
230	my ($dir, $file) = @{pop @trs};	380	my ($dir, $file) = @{pop @trs};
		381	my $path = "$dir/$file";
		382
		383	my $trs;
		384	if (0 > aio_load $path, $trs) {
		385	warn "$path: $!, skipping.\n";
		386	next;
		387	}
		388
		389	$TRS .= $trs;
		390	}
		391	}
		392
		393	sub process_res {
		394	while (@res) {
		395	my ($dir, $file, $type) = @{pop @res};
		396
		397	my $data;
		398	aio_load "$dir/$file", $data;
		399
		400	my $copyright;
		401	aio_load "$dir/copyright", $copyright;
		402
		403	$file =~ s/\.res$//;
		404	$file =~ /\.([^.]+)$/
		405	or next;
		406
		407	substr $dir, 0, 1 + length $PATH, "";
		408
		409	$RESOURCE{"$dir/$file"} = {
		410	type => $type,
		411	copyright => $copyright,
		412	data => $data,
		413	chksum => Digest::MD5::md5 $data,
		414	};
231	}	415	}
232	}	416	}
233		417
234	sub find_files;	418	sub find_files;
235	sub find_files {	419	sub find_files {
…		…
240	my ($dirs, $nondirs) = @_;	424	my ($dirs, $nondirs) = @_;
241		425
242	find_files "$path/$_"	426	find_files "$path/$_"
243	for grep $_ !~ /^(?:CVS\|dev)$/, @$dirs;	427	for grep $_ !~ /^(?:CVS\|dev)$/, @$dirs;
244		428
		429	my $dir = $path;
		430	substr $dir, 0, 1 + length $PATH, "";
		431
245	for my $file (@$nondirs) {	432	for my $file (@$nondirs) {
		433	if ($dir =~ /^music(?:\/\|$)/) {
		434	push @res, [$path, $file, 3] # FT_MUSIC
		435	if $file =~ /\.(ogg)$/;
		436
		437	} elsif ($dir =~ /^sounds(?:\/\|$)/) {
		438	push @res, [$path, $file, 5] # FT_SOUND
		439	if $file =~ /\.(wav\|ogg)$/;
		440
		441	} elsif ($dir =~ /^res(?:\/\|$)/) {
		442	push @res, [$path, $file, 0] # FT_FACE
		443	if $file =~ /\.(jpg\|png)$/;
		444	push @res, [$path, $file, 7] # FT_RSRC
		445	if $file =~ /\.(res)$/;
		446
246	if ($file =~ /\.png$/) {	447	} elsif ($file =~ /\.png$/) {
247	push @png, "$path/$file";	448	push @png, ["$path/$file", 0];
		449
248	} elsif ($file =~ /\.trs$/) {	450	} elsif ($file =~ /\.trs$/) {
249	push @trs, [$path, $file];	451	push @trs, [$path, $file];
		452
250	} elsif ($file =~ /\.arc$/) {	453	} elsif ($file =~ /\.arc$/) {
251	push @arc, [$path, $file];	454	push @arc, [$path, $file];
		455
252	} else {	456	} else {
253	warn "ignoring $path/$file\n" if $VERBOSE >= 2;	457	warn "ignoring $path/$file\n" if $VERBOSE >= 3;
254	}	458	}
255	}	459	}
256	};	460	};
257	}	461	}
258		462
259	sub inst_arch($) {	463	sub inst_arch($) {
260	my (undef, $path) = @_;	464	my (undef, $path) = @_;
261		465
		466	$PATH = $path;
		467
		468	print "\n",
262	print "installing '$path' to '$DATADIR'\n\n";	469	"Installing '$path' to '$DATADIR'\n",
		470	"\n",
		471	"This can take a long time if you run this\n",
		472	"for the first time or do not use --cache.\n",
		473	"\n",
		474	"Unless you run verbosely, all following warning\n",
		475	"or error messages indicate serious problems.\n",
		476	"\n";
263		477
264	if (!-d "$path/treasures") {	478	if (!-d "$path/treasures") {
265	warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";	479	warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
266	exit 1 unless $FORCE;	480	exit 1 unless $FORCE;
267	}	481	}
268		482
269	find_files $path;	483	find_files $path;
270	IO::AIO::flush;	484	IO::AIO::flush;
271		485
272	$_->join for (	486	$_->join for (
273	(async \&process_png), (async \&process_png),	487	# four png crunchers work fine for my 2x smp machine
		488	(async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
274	(async \&process_trs), (async \&process_trs),	489	(async \&process_trs), (async \&process_trs),
275	(async \&process_arc), (async \&process_arc),	490	(async \&process_arc), (async \&process_arc),
		491	(async \&process_res), (async \&process_res),
276	);	492	);
277		493
278	{	494	{
279	open my $fh, ">:utf8", "$DATADIR/animations~"	495	# remove path prefix from editor_folder
280	or die "$DATADIR/animations~: $!";	496	substr $_->{editor_folder}, 0, 1 + length $path, ""
281	print $fh $ANIM;	497	for values %ARC;
		498
		499	# resolve inherit
		500	while () {
		501	my $progress;
		502	my $loop;
		503
		504	for my $o (values %ARC) {
		505	if (my $other = $o->{inherit}) {
		506	if (my $s = $ARC{$other}) {
		507	if ($s->{inherit}) {
		508	$loop = $s;
		509	} else {
		510	delete $o->{inherit};
		511	my %s = %$s;
		512	delete @s{qw(_name more name name_pl)};
		513	%$o = ( %s, %$o );
		514	++$progress;
		515	}
		516	} else {
		517	warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
		518	delete $ARC{$o->{_name}};
		519	}
		520	}
		521	}
		522
		523	unless ($progress) {
		524	die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
		525	if $loop;
		526
		527	last;
		528	}
282	}	529	}
283		530
284	{	531	# remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
		532	@ARC = grep $_->{_name} !~ /^(?:type\|class)_/, @ARC;
		533
285	open my $fh, ">:utf8", "$DATADIR/archetypes~"	534	open my $fh, ">:utf8", "$DATADIR/archetypes~"
286	or die "$DATADIR/archetypes~: $!";	535	or die "$DATADIR/archetypes~: $!";
287	print $fh Crossfire::archlist_to_string \@ARC;	536	print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
288	}	537	}
289
290	@PNG = sort { $a->[0] cmp $b->[0] } @PNG;
291		538
292	{	539	{
		540	open my $fh, ">:utf8", "$DATADIR/treasures~"
		541	or die "$DATADIR/treasures~: $!";
		542	print $fh $TRS;
		543	}
		544
		545	{
		546	while (my ($k, $v) = each %FACEINFO) {
		547	length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
		548	length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
		549
		550	length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
		551	#length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
		552
		553	$v->{chksum32} = Digest::MD5::md5 $v->{data32};
		554	$v->{chksum64} = Digest::MD5::md5 $v->{data64};
		555
		556	if (my $magicmap = $v->{magicmap}) {
		557	$magicmap =~ y/A-Z_\-/a-z/d;
		558	$v->{magicmap} = $COLOR{$magicmap};
		559	}
		560	}
		561
293	open my $fh, ">:perlio", "$DATADIR/crossfire.0~"	562	open my $fh, ">:perlio", "$DATADIR/facedata~"
294	or die "$DATADIR/crossfire.0~: $!";	563	or die "$DATADIR/facedata~: $!";
295	printf $fh "IMAGE %d %d %s\x0a%s", $_, (length $PNG[$_][1]), $PNG[$_][0], $PNG[$_][1]	564
296	for 0.. $#PNG;	565	print $fh freeze {
		566	version => 2,
		567	faceinfo => \%FACEINFO,
		568	animinfo => \%ANIMINFO,
		569	resource => \%RESOURCE,
297	}	570	};
		571	}
298		572
299	rename "$DATADIR/archetypes~" , "$DATADIR/archetypes";	573	for (qw(archetypes facedata treasures)) {
300	rename "$DATADIR/crossfire.0~", "$DATADIR/crossfire.0";	574	chmod 0644, "$DATADIR/$_~";
301	rename "$DATADIR/animations~" , "$DATADIR/animations";	575	rename "$DATADIR/$_~", "$DATADIR/$_"
		576	or die "$DATADIR/$_: $!";
		577	}
302		578
303	die "--install-arch not fully implemented\n";	579	print "archetype data installed successfully.\n";
304	}	580	}
305	}	581	}
306		582
307	Getopt::Long::Configure ("bundling", "no_ignore_case");	583	Getopt::Long::Configure ("bundling", "no_ignore_case");
308	GetOptions (	584	GetOptions (

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.5 by root, Thu Mar 8 15:19:08 2007 UTC vs. Revision 1.44 by root, Tue Jul 24 04:55:35 2007 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.5 by root, Thu Mar 8 15:19:08 2007 UTC vs.
Revision 1.44 by root, Tue Jul 24 04:55:35 2007 UTC