--- deliantra/server/utils/cfutil.in	2007/07/25 22:30:38	1.46
+++ deliantra/server/utils/cfutil.in	2007/07/31 02:24:43	1.48
@@ -415,16 +415,16 @@
 
          my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
 
-         $file =~ s/\.res$//;
-         $file =~ s/\.(ogg|wav|jpg|png)$//;
-
-         substr $dir, 0, 1 + length $PATH, "";
-
          $meta = {
             %{ $meta->{""   } || {} },
             %{ $meta->{$file} || {} },
          };
 
+         $file =~ s/\.res$//;
+         $file =~ s/\.(ogg|wav|jpg|png)$//;
+
+         substr $dir, 0, 1 + length $PATH, "";
+
          $RESOURCE{"$dir/$file"} = {
             type   => (delete $meta->{type}) || $type,
             data   => $data,
@@ -453,7 +453,7 @@
                push @res, [$path, $file, 3] # FT_MUSIC
                   if $file =~ /\.(ogg)$/;
 
-            } elsif ($dir =~ /^sounds(?:\/|$)/) {
+            } elsif ($dir =~ /^sound(?:\/|$)/) {
                push @res, [$path, $file, 5] # FT_SOUND
                   if $file =~ /\.(wav|ogg)$/;