--- deliantra/server/utils/cfutil.in	2007/07/23 23:38:18	1.43
+++ deliantra/server/utils/cfutil.in	2007/07/31 02:24:43	1.48
@@ -390,29 +390,46 @@
       }
    }
 
+   my %FILECACHE;
+
+   sub load_cached($;$) {
+      unless (exists $FILECACHE{$_[0]}) {
+         my $data;
+         if (0 < aio_load $_[0], $data) {
+            $data = $_[1]->($data)
+               if $_[1];
+         }
+
+         $FILECACHE{$_[0]} = $data;
+      }
+
+      $FILECACHE{$_[0]}
+   }
+
    sub process_res {
       while (@res) {
-         my ($dir, $file) = @{pop @res};
+         my ($dir, $file, $type) = @{pop @res};
 
          my $data;
          aio_load "$dir/$file", $data;
 
-         my $copyright;
-         aio_load "$dir/copyright", $copyright;
+         my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
 
-         $file =~ s/\.res$//;
-         $file =~ /\.([^.]+)$/
-            or next;
+         $meta = {
+            %{ $meta->{""   } || {} },
+            %{ $meta->{$file} || {} },
+         };
 
-         my $type = $1;
+         $file =~ s/\.res$//;
+         $file =~ s/\.(ogg|wav|jpg|png)$//;
 
          substr $dir, 0, 1 + length $PATH, "";
 
          $RESOURCE{"$dir/$file"} = {
-            type      => $1,
-            copyright => $copyright,
-            data      => $data,
-            chksum    => Digest::MD5::md5 $data,
+            type   => (delete $meta->{type}) || $type,
+            data   => $data,
+            chksum => (Digest::MD5::md5 $data),
+            %$meta ? (meta => $meta) : (),
          };
       }
    }
@@ -432,14 +449,29 @@
          substr $dir, 0, 1 + length $PATH, "";
 
          for my $file (@$nondirs) {
-            if ($file =~ /\.(ogg|jpg|res)$/ || $dir =~ /^res(?:\/|$)/) {
-               push @res, [$path, $file];
+            if ($dir =~ /^music(?:\/|$)/) {
+               push @res, [$path, $file, 3] # FT_MUSIC
+                  if $file =~ /\.(ogg)$/;
+
+            } elsif ($dir =~ /^sound(?:\/|$)/) {
+               push @res, [$path, $file, 5] # FT_SOUND
+                  if $file =~ /\.(wav|ogg)$/;
+
+            } elsif ($dir =~ /^res(?:\/|$)/) {
+               push @res, [$path, $file, 0] # FT_FACE
+                  if $file =~ /\.(jpg|png)$/;
+               push @res, [$path, $file, 7] # FT_RSRC
+                  if $file =~ /\.(res)$/;
+
             } elsif ($file =~ /\.png$/) {
                push @png, ["$path/$file", 0];
+
             } elsif ($file =~ /\.trs$/) {
                push @trs, [$path, $file];
+
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
+
             } else {
                warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }