--- deliantra/server/utils/cfutil.in	2007/08/19 10:28:52	1.54
+++ deliantra/server/utils/cfutil.in	2007/08/21 19:44:57	1.58
@@ -23,7 +23,6 @@
 use Coro::AIO;
 use Coro::Util;
 use POSIX ();
-use Digest::MD5;
 use Carp;
 use Coro::Channel;
 use Coro::Storable; $Storable::canonical = 1;
@@ -181,7 +180,7 @@
          }
 
          my $arc = $FACEINFO{$base}{arc}
-            or die "FATAL: internal error, cannot continue";
+            or die "FATAL: internal error <$base>, cannot continue";
 
          unless ($path =~ /~$/) {
             # possibly enlarge
@@ -201,7 +200,7 @@
                      if (
                         !$is_floor
                         && !$arc->{alive}
-                        && $arc->{no_pass}
+                        && $arc->{move_block} eq "all"
                         && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
                      ) {
                         ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
@@ -428,12 +427,17 @@
                   };
                }
 
-               for my $face ($o->{face} || (), @{$anim || []}) {
-                  next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
+               for ($o->{face} || (), @{$anim || []}) {
+                  next if /^facings\s/;
 
-                  my $info = $FACEINFO{$face} ||= {};
+                  my $face = $_;
+                  $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
+
+                  my $info = $FACEINFO{$face} ||= { };
+                  $info->{arc} = $o;
+
+                  next if $face =~ /^blank.x11$|^empty.x11$/;
 
-                  $info->{arc}        = $o;
                   $info->{visibility} = $visibility if defined $visibility;
                   $info->{magicmap}   = $magicmap   if defined $magicmap;
                }
@@ -521,7 +525,6 @@
          $RESOURCE{"$dir/$file"} = {
             type   => (delete $meta->{type}) || $type,
             data   => $data,
-            chksum => (Digest::MD5::md5 $data),
             %$meta ? (meta => $meta) : (),
          };
       }
@@ -681,9 +684,6 @@
             length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
             #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
 
-            $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};