--- deliantra/server/lib/cf.pm	2007/07/23 21:02:50	1.316
+++ deliantra/server/lib/cf.pm	2007/07/24 22:49:40	1.320
@@ -2520,7 +2520,7 @@
       # send meta info to client, if not yet sent
       unless (exists $self->{channel}{$channel->{id}}) {
          $self->{channel}{$channel->{id}} = $channel;
-         $self->ext_msg (channel_info => %$channel);
+         $self->ext_msg (channel_info => $channel);
       }
 
       $channel = $channel->{id};
@@ -2867,26 +2867,32 @@
       my $res = $facedata->{resource};
       my $enc = JSON::XS->new->utf8->canonical;
 
+      if (my $soundconf = delete $res->{"res/sound.conf"}) {
+         $soundconf = $enc->decode (delete $soundconf->{data});
+         # todo
+      }
+
       while (my ($name, $info) = each %$res) {
          my $meta = $enc->encode ({
-            name      => $name,
-            type      => $info->{type},
-            copyright => $info->{copyright}, #TODO#
+            name => $name,
+            %{ $info->{meta} || {} },
          });
 
          my $idx = (cf::face::find $name) || cf::face::alloc $name;
 
-         if ($name =~ /\.jpg$/) {
-            cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
-            cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
-         } else {
+         if ($info->{type} & 1) {
+            # prepend meta info
+
             my $data = pack "(w/a*)*", $meta, $info->{data};
             my $chk  = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
 
-            cf::face::set_type $idx, 1;
             cf::face::set_data $idx, 0, $data, $chk;
+         } else {
+            cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
          }
 
+         cf::face::set_type $idx, $info->{type};
+
          cf::cede_to_tick;
       }
    }
@@ -2894,6 +2900,14 @@
    1
 }
 
+register_exticmd fx_want => sub {
+   my ($ns, $want) = @_;
+
+   while (my ($k, $v) = each %$want) {
+      $ns->fx_want ($k, $v);
+   }
+};
+
 sub reload_regions {
    load_resource_file "$MAPDIR/regions"
       or die "unable to load regions file\n";