--- deliantra/server/utils/cfutil.in	2007/04/10 09:35:24	1.23
+++ deliantra/server/utils/cfutil.in	2007/04/13 05:08:51	1.25
@@ -22,7 +22,7 @@
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
-use Storable; $Storable::canonical = 1;
+use Coro::Storable; $Storable::canonical = 1;
 
 sub usage {
    warn <<EOF;
@@ -84,11 +84,11 @@
 }
 
 {
+   our %ANIMINFO;
    our %FACEINFO;
    our @ARC;
    our $TRS;
    our $NFILE;
-   our %ANIM;
 
    our $QUANTIZE = "+dither -colorspace RGB -colors 256";
 
@@ -286,17 +286,27 @@
                my $anim = delete $o->{anim};
 
                if ($anim) {
+                  # possibly add $ext to the animation name to avoid
+                  # the need to specify archnames for all parts
+                  # of a multipart archetype.
                   $o->{animation} = "$o->{_name}";
+                  my $facings = 1;
+                  my @frames;
 
                   for (@$anim) {
-                     $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/;
+                     if (/^facings\s+(\d+)/) {
+                        $facings = $1*1;
+                     } elsif (/^blank.x11$|^empty.x11$/) {
+                        push @frames, $_;
+                     } else {
+                        push @frames, "$_$ext";
+                     }
                   }
 
-                  $ANIM{"$o->{_name}$ext"} =
-                     join "", map "$_\n",
-                        "anim $o->{_name}",
-                        @$anim,
-                        "mina";
+                  $ANIMINFO{$o->{animation}} = {
+                     facings => $facings,
+                     frames  => \@frames,
+                  };
                }
 
                for my $face ($o->{face} || (), @{$anim || []}) {
@@ -384,12 +394,6 @@
       );
 
       {
-         open my $fh, ">:utf8", "$DATADIR/animations~"
-            or die "$DATADIR/animations~: $!";
-         print $fh join "", map $ANIM{$_}, sort keys %ANIM
-      }
-
-      {
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
          substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
@@ -417,11 +421,14 @@
          open my $fh, ">:perlio", "$DATADIR/facedata~"
             or die "$DATADIR/facedata~: $!";
 
-         $FACEINFO{""} = { version => 1};
-         print $fh Storable::nfreeze \%FACEINFO;
+         print $fh freeze {
+            version => 2,
+            faceinfo => \%FACEINFO,
+            animinfo => \%ANIMINFO,
+         };
       }
 
-      for (qw(archetypes facedata animations treasures)) {
+      for (qw(archetypes facedata treasures)) {
          chmod 0644, "$DATADIR/$_~";
          rename "$DATADIR/$_~", "$DATADIR/$_"
             or die "$DATADIR/$_: $!";