--- deliantra/server/include/cfperl.h	2006/08/27 15:24:21	1.9
+++ deliantra/server/include/cfperl.h	2006/08/28 16:52:51	1.13
@@ -16,6 +16,7 @@
 enum data_type
 {
   DT_END,     // no further arguments
+  DT_AV,      // perl-only av that needs to be flattened out
   DT_INT,
   DT_INT64,
   DT_DOUBLE,
@@ -27,13 +28,13 @@
   DT_ARCH,
   DT_PARTY,
   DT_REGION,
-  DT_AV,      // av that needs to be flattened out
 
   NUM_DATA_TYPES
 };
 
 enum event_klass
 {
+  KLASS_NONE,
   KLASS_GLOBAL,
   KLASS_PLAYER,
   KLASS_OBJECT,
@@ -48,6 +49,7 @@
   NUM_EVENT_TYPES
 };
 
+#define ARG_AV(o)     DT_AV    , static_cast<AV *>   (o)
 #define ARG_INT(v)    DT_INT   , static_cast<int>    (v)
 #define ARG_INT64(v)  DT_INT64 , static_cast<sint64> (v)
 #define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
@@ -78,71 +80,77 @@
 bool cfperl_invoke (event_type event, ...);
 int cfperl_result_INT (int idx);
 
-struct extendable_base
+struct attachable_base
 {
   void *self, *cb;    // CF+ perl self and callback
   const char *attach; // generic extension attachment information
 
-  void clear ();                                 // called when free'ing objects
-  void optimise ();                              // possibly save some memory by destroying unneeded data
+  void clear ();     // called when free'ing objects
+  void optimise ();  // possibly save some memory by destroying unneeded data
+  void instantiate (data_type type, void *obj);
 
-  void extendable_init ()
+  void attachable_init ()
   {
     self = cb = 0;
     attach = 0;
   }
 };
 
-// objects extendable from perl (or any other extension) should include or
+// objects attachable from perl (or any other extension) should include or
 // derive using the curiously recurring template pattern, to avoid
 // virtual method calls etc.
 template<class subclass>
-struct extendable : extendable_base
+struct attachable : attachable_base
 {
   static data_type get_dt ()
   {
-    subclass::get_dt ();
+    return subclass::get_dt ();
+  }
+
+  void instantiate ()
+  {
+    if (attach)
+      attachable_base::instantiate (get_dt (), static_cast<subclass *>(this));
   }
 };
 
-struct object_freezer
+struct object_freezethaw
 {
-  const char *filename;
   void *av;
-  int idx;
+  FILE *fp;
+
+  operator FILE *() { return fp; }
+};
+
+struct object_freezer : object_freezethaw
+{
+  void *filename;
 
   object_freezer (const char *filename);
   ~object_freezer ();
 
-  void put (extendable_base *ext);
+  void put (attachable_base *ext);
 
   template<class subclass>
-  void put (extendable<subclass> *obj)
+  void put (attachable<subclass> *obj)
   {
-    put ((extendable_base *)obj);
+    put ((attachable_base *)obj);
   }
-
-  void finish ();
 };
 
-struct object_thawer
+struct object_thawer : object_freezethaw
 {
-  void *av;
-  int idx;
-
-  object_thawer (const char *filename = 0);
+  object_thawer (FILE *fp, const char *filename = 0);
   ~object_thawer ();
 
-  void get (data_type type, void *obj, extendable_base *ext);
+  void get (data_type type, void *obj, attachable_base *ext, int oid);
 
   template<class subclass>
-  void get (extendable<subclass> *obj)
+  void get (attachable<subclass> *obj, int oid)
   {
     if (av)
-      get (subclass::get_dt (), (subclass *)obj, obj);
+      get (subclass::get_dt (), (subclass *)obj, obj, oid);
   }
-
-  void finish ();
 };
 
 #endif