--- deliantra/server/include/cfperl.h	2006/08/30 16:30:37	1.16
+++ deliantra/server/include/cfperl.h	2006/08/31 06:23:19	1.17
@@ -11,6 +11,8 @@
 #include <EXTERN.h>
 #include <perl.h>
 
+#include "keyword.h"
+
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
 #undef srand48
@@ -106,8 +108,8 @@
 
 struct attachable_base
 {
-  struct sv *self;
-  struct av *cb;    // CF+ perl self and callback
+  SV *self;
+  AV *cb;    // CF+ perl self and callback
   const char *attach; // generic extension attachment information
 
   void clear ();     // called when free'ing objects
@@ -140,17 +142,12 @@
   }
 };
 
-struct object_freezethaw
+struct object_freezer
 {
-  struct av *av;
-};
+  AV *av;
+  SV *text;
 
-struct object_freezer : object_freezethaw
-{
-  struct sv *text;
-  void *filename;
-
-  object_freezer (const char *filename);
+  object_freezer ();
   ~object_freezer ();
 
   void put (attachable_base *ext);
@@ -161,12 +158,28 @@
     put ((attachable_base *)obj);
   }
 
+  bool save (const char *filename);
+
   operator bool () { return !!av; }
 };
 
-struct object_thawer : object_freezethaw
+// compatibility support, should be removed when no longer needed
+int fprintf (object_freezer &freezer, const char *format, ...);
+int fputs (const char *s, object_freezer &freezer);
+
+// a single key-value line from a file
+struct token {
+   keyword k;
+   const char *v;
+
+   token (keyword k, const char *v = 0) : k(k), v(v) { }
+};
+
+struct object_thawer
 {
+  AV *av;
   FILE *fp;
+  char line[1024];
 
   object_thawer (const char *filename = 0);
   ~object_thawer ();
@@ -180,12 +193,10 @@
       get (subclass::get_dt (), (subclass *)obj, obj, oid);
   }
 
+  token get_token ();
+
   operator FILE *() { return fp; }
 };
 
-// compatibility support, should be removed when no longer needed
-int fprintf (object_freezer &freezer, const char *format, ...);
-int fputs (const char *s, object_freezer &freezer);
-
 #endif