[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 2012 UTC

 our $RANDOMDIR   = "$LOCALDIR/random";
 our $BDBDIR      = "$LOCALDIR/db";
 our $PIDFILE     = "$LOCALDIR/pid";
 our $RUNTIMEFILE = "$LOCALDIR/runtime";
-our %RESOURCE; # unused
+#our %RESOURCE; # unused
 our $OUTPUT_RATE_MIN =    3000;
 our $OUTPUT_RATE_MAX = 1000000;
 our $MAX_LINKS       = 32; # how many chained exits to follow
    {
       my $res = $facedata->{resource};
       while (my ($name, $info) = each %$res) {
-         if (defined $info->{type}) {
+         if (defined (my $type = delete $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_data $idx, 0, delete $info->{data}, delete $info->{hash};
-            cf::face::set_type $idx, $info->{type};
+            cf::face::set_type $idx, $type;
+            cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
          } else {
-            $RESOURCE{$name} = $info; # unused
+#            $RESOURCE{$name} = $info; # unused
          }
          cf::cede_to_tick;
       }
    }

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