ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.16 by root, Wed Mar 14 15:47:21 2007 UTC vs.
Revision 1.40 by root, Mon Jul 16 19:43:33 2007 UTC

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

Diff Legend

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