--- deliantra/server/include/cfperl.h	2007/08/16 06:36:56	1.87
+++ deliantra/server/include/cfperl.h	2007/11/08 19:43:24	1.90
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 //
@@ -214,7 +214,17 @@
   }
 
   // set a custom key to the given value, or delete it if value = 0
-  void set_key (const char *key, const char *value = 0);
+  void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
+
+  void set_key_text (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 1);
+  }
+
+  void set_key_data (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 0);
+  }
 
   attachable &operator =(const attachable &src);
 
@@ -250,6 +260,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+INTERFACE_CLASS(object_freezer)
 struct object_freezer : dynbuf_text
 {
   AV *av;
@@ -363,12 +374,13 @@
     put (k, (T *)v);
   }
 
-  bool save (const char *path);
+  MTH bool save (const_octet_string path);
   char *as_string (); // like strdup
 
   operator bool () { return !!av; }
 };
 
+INTERFACE_CLASS(object_thawer)
 struct object_thawer
 {
   char *line; // current beginning of line
@@ -381,7 +393,7 @@
   char *value_nn; // the value, or the empty string if no value
   const char *name;
 
-  operator bool () { return !!text; }
+  operator bool () const { return !!text; }
 
   object_thawer (const char *path = 0);
   object_thawer (const char *data, AV *perlav);
@@ -390,10 +402,11 @@
   void get (attachable *obj, int oid);
 
   // parse next line
-  void next ();
+  MTH void next ();
   // skip the current key-value (usually fetch next line, for
   // multiline-fields, skips till the corresponding end-kw
-  void skip ();
+  MTH void skip ();
+  MTH void skip_block (); // skips till and over KW_end
 
   char *get_str () { return value; } // may be 0
   void get_ml (keyword kend, shstr &sh);
@@ -419,8 +432,18 @@
   void get (uint32 &i) { i = get_sint64 (); }
   void get (sint64 &i) { i = get_sint64 (); }
 
-  void parse_warn (const char *msg);
-  bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+  MTH void parse_warn (const char *msg);
+  MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+
+  struct delayed_ref {
+    attachable *op;
+    object_ptr *ptr;
+    const char *ref;
+  };
+  std::vector<delayed_ref> delrefs;
+
+  void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
+  MTH void resolve_delayed_derefs (bool deref = true);
 };
 
 //TODO: remove