[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.56 by root, Sun Aug 19 15:47:56 2007 UTC vs.
Revision 1.60 by root, Mon Aug 27 02:43:38 2007 UTC

 use Crossfire;
 use Coro;
 use Coro::AIO;
 use Coro::Util;
 use POSIX ();
-use Digest::MD5;
 use Carp;
 use Coro::Channel;
 use Coro::Storable; $Storable::canonical = 1;
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
          (my $base = $stem) =~ s/^.*\///;
          my $fi = $FACEINFO{$base};
          unless ($fi) {
-            warn "$path: <$base> not referenced by any archetype, skipping.\n";
+            #warn "$path: <$base> not referenced by any archetype, skipping.\n";
-            next;
+            #next;
          }
-         my $arc = $FACEINFO{$base}{arc}
+         my $arc = $fi->{arc} || { };
-            or die "FATAL: internal error <$base>, cannot continue";
          unless ($path =~ /~$/) {
             # possibly enlarge
             if (0 > aio_stat "$stem.64x64.png") {
                my $other = "$stem.64x64.png~";
                      facings => $facings,
                      frames  => \@frames,
                   };
                }
-               for my $face ($o->{face} || (), @{$anim || []}) {
+               for ($o->{face} || (), @{$anim || []}) {
-                  next if $face =~ /^facings\s/;
+                  next if /^facings\s/;
+                  my $face = $_;
+                  $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
                   my $info = $FACEINFO{$face} ||= { };
                   $info->{arc} = $o;
                   next if $face =~ /^blank.x11$|^empty.x11$/;
          my ($dir, $file, $type) = @$job;
          my $data;
          aio_load "$dir/$file", $data;
-         my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
+         my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
          next if $meta && !exists $meta->{$file};
          $meta = {
             %{ $meta->{""   } || {} },
          substr $dir, 0, 1 + length $PATH, "";
          $RESOURCE{"$dir/$file"} = {
             type   => (delete $meta->{type}) || $type,
             data   => $data,
-            chksum => (Digest::MD5::md5 $data),
             %$meta ? (meta => $meta) : (),
          };
       }
    }
             length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
             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};
             }

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.56 by root, Sun Aug 19 15:47:56 2007 UTC vs. Revision 1.60 by root, Mon Aug 27 02:43:38 2007 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.56 by root, Sun Aug 19 15:47:56 2007 UTC vs.
Revision 1.60 by root, Mon Aug 27 02:43:38 2007 UTC