--- deliantra/server/lib/cf.pm	2012/01/03 02:08:49	1.576
+++ deliantra/server/lib/cf.pm	2012/01/04 03:22:28	1.579
@@ -1,7 +1,7 @@
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
 # 
-# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
 # 
 # Deliantra is free software: you can redistribute it and/or modify it under
 # the terms of the Affero GNU General Public License as published by the
@@ -110,7 +110,7 @@
 our $PIDFILE     = "$LOCALDIR/pid";
 our $RUNTIMEFILE = "$LOCALDIR/runtime";
 
-our %RESOURCE; # unused
+#our %RESOURCE; # unused
 
 our $OUTPUT_RATE_MIN =    3000;
 our $OUTPUT_RATE_MAX = 1000000;
@@ -3516,13 +3516,15 @@
       my $res = $facedata->{resource};
 
       while (my ($name, $info) = each %$res) {
-         if (defined $info->{type}) {
+         if (defined (my $type = $info->{type})) {
+            # TODO: different hash - must free and use new index, or cache ixface data queue
             my $idx = (cf::face::find $name) || cf::face::alloc $name;
 
             cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
-            cf::face::set_type $idx, $info->{type};
+            cf::face::set_type $idx, $type;
+            cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # any keys left are stashed into meta unless prepended
          } else {
-            $RESOURCE{$name} = $info; # unused
+#            $RESOURCE{$name} = $info; # unused
          }
 
          cf::cede_to_tick;
@@ -3668,7 +3670,7 @@
    cf::init_globals; # initialise logging
 
    LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
-   LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
+   LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
    LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
    LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";