--- deliantra/server/include/cfperl.h	2006/08/26 23:36:32	1.7
+++ deliantra/server/include/cfperl.h	2006/08/27 16:15:12	1.8
@@ -28,6 +28,8 @@
   DT_PARTY,
   DT_REGION,
   DT_AV,      // av that needs to be flattened out
+
+  NUM_DATA_TYPES
 };
 
 enum event_klass
@@ -82,7 +84,12 @@
 
   void clear ();                                 // called when free'ing objects
   void optimise ();                              // possibly save some memory by destroying unneeded data
-  void reattach (data_type type, void *self);    // called after swapin
+
+  void extendable_init ()
+  {
+    self = cb = 0;
+    attach = 0;
+  }
 };
 
 // objects extendable from perl (or any other extension) should include or
@@ -91,13 +98,9 @@
 template<class subclass>
 struct extendable : extendable_base
 {
-  void reattach ()
+  static data_type get_dt ()
   {
-    if (attach)
-      extendable_base::reattach (
-         static_cast<subclass *>(this)->get_dt (),
-         static_cast<subclass *>(this)
-      );
+    subclass::get_dt ();
   }
 };
 
@@ -105,18 +108,39 @@
 {
   const char *filename;
   void *av;
+  int idx;
+
+  object_freezer (const char *filename);
+  ~object_freezer ();
+
+  void put (extendable_base *ext);
+
+  template<class subclass>
+  void put (extendable<subclass> *obj)
+  {
+    put ((extendable_base *)obj);
+  }
 
-  object_freezer (const char *filename) : filename (filename) { }
-  void put (extendable_base *object);
   void finish ();
 };
 
 struct object_thawer
 {
   void *av;
+  int idx;
+
+  object_thawer (const char *filename = 0);
+  ~object_thawer ();
+
+  void get (data_type type, void *obj, extendable_base *ext);
+
+  template<class subclass>
+  void get (extendable<subclass> *obj)
+  {
+    if (av)
+      get (subclass::get_dt (), (subclass *)obj, obj);
+  }
 
-  object_thawer (const char *filename);
-  void get (extendable_base *object);
   void finish ();
 };