--- deliantra/server/utils/cfutil.in	2007/05/07 06:01:48	1.34
+++ deliantra/server/utils/cfutil.in	2007/06/03 15:32:51	1.35
@@ -45,6 +45,22 @@
 my $TMPDIR  = "/tmp/cfutil$$~";
 my $TMPFILE = "aaaa0";
 
+our %COLOR = (
+   black      =>  0,
+   white      =>  1,
+   navy       =>  2,
+   red        =>  3,
+   orange     =>  4,
+   blue       =>  5,
+   darkorange =>  6,
+   green      =>  7,
+   lightgreen =>  8,
+   grey       =>  9,
+   brown      => 10,
+   gold       => 11,
+   tan        => 12,
+);
+
 END { system "rm", "-rf", $TMPDIR }
 
 Event->signal (signal => "INT",  cb => sub { exit 1 });
@@ -303,8 +319,8 @@
 
                $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
 
-               my $visibility = delete $o->{visibility} if exists $o->{visibility};
-               my $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
+               $visibility = delete $o->{visibility} if exists $o->{visibility};
+               $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
 
                my $anim = delete $o->{anim};
 
@@ -483,6 +499,11 @@
 
             $v->{chksum32} = Digest::MD5::md5 $v->{data32};
             $v->{chksum64} = Digest::MD5::md5 $v->{data64};
+
+            if (my $magicmap = $v->{magicmap}) {
+               $magicmap =~ y/A-Z_\-/a-z/d;
+               $v->{magicmap} = $COLOR{$magicmap};
+            }
          }
 
          open my $fh, ">:perlio", "$DATADIR/facedata~"