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.34 by root, Mon May 7 06:01:48 2007 UTC vs.
Revision 1.35 by root, Sun Jun 3 15:32:51 2007 UTC

42my $VERBOSE = 1; 42my $VERBOSE = 1;
43my $CACHE = 0; 43my $CACHE = 0;
44my $FORCE; 44my $FORCE;
45my $TMPDIR = "/tmp/cfutil$$~"; 45my $TMPDIR = "/tmp/cfutil$$~";
46my $TMPFILE = "aaaa0"; 46my $TMPFILE = "aaaa0";
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);
47 63
48END { system "rm", "-rf", $TMPDIR } 64END { system "rm", "-rf", $TMPDIR }
49 65
50Event->signal (signal => "INT", cb => sub { exit 1 }); 66Event->signal (signal => "INT", cb => sub { exit 1 });
51Event->signal (signal => "TERM", cb => sub { exit 1 }); 67Event->signal (signal => "TERM", cb => sub { exit 1 });
301 317
302 my $ext = $x|$y ? "+$x+$y" : ""; 318 my $ext = $x|$y ? "+$x+$y" : "";
303 319
304 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 320 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
305 321
306 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 322 $visibility = delete $o->{visibility} if exists $o->{visibility};
307 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 323 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
308 324
309 my $anim = delete $o->{anim}; 325 my $anim = delete $o->{anim};
310 326
311 if ($anim) { 327 if ($anim) {
312 # possibly add $ext to the animation name to avoid 328 # possibly add $ext to the animation name to avoid
481 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 497 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
482 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 498 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
483 499
484 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 500 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
485 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 501 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
502
503 if (my $magicmap = $v->{magicmap}) {
504 $magicmap =~ y/A-Z_\-/a-z/d;
505 $v->{magicmap} = $COLOR{$magicmap};
506 }
486 } 507 }
487 508
488 open my $fh, ">:perlio", "$DATADIR/facedata~" 509 open my $fh, ">:perlio", "$DATADIR/facedata~"
489 or die "$DATADIR/facedata~: $!"; 510 or die "$DATADIR/facedata~: $!";
490 511

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines