--- deliantra/server/include/cfperl.h	2006/08/26 23:36:32	1.7
+++ deliantra/server/include/cfperl.h	2006/08/27 17:59:26	1.10
@@ -28,6 +28,8 @@
   DT_PARTY,
   DT_REGION,
   DT_AV,      // av that needs to be flattened out
+
+  NUM_DATA_TYPES
 };
 
 enum event_klass
@@ -61,12 +63,13 @@
 // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
 
 // all these return true when the normal event processing should be skipped (if any)
-#define INVOKE(klass, event, ...) cfperl_invoke (EVENT_ ## klass ## _ ## event, ## __VA_ARGS__, DT_END)
+#define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END)
 
-#define INVOKE_GLOBAL(event, ...)     INVOKE (GLOBAL, event,                  ## __VA_ARGS__)
-#define INVOKE_OBJECT(event, op, ...) INVOKE (OBJECT, event, ARG_OBJECT (op), ## __VA_ARGS__)
-#define INVOKE_PLAYER(event, pl, ...) INVOKE (PLAYER, event, ARG_PLAYER (pl), ## __VA_ARGS__)
-#define INVOKE_MAP(event, map, ...)   INVOKE (MAP   , event, ARG_MAP (map)  , ## __VA_ARGS__)
+#define INVOKE(klass, event, ...)     INVOKE_(EVENT_ ## klass  ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_GLOBAL(event, ...)     INVOKE_(EVENT_ ## GLOBAL ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_OBJECT(event, op, ...) INVOKE_(EVENT_ ## OBJECT ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__)
+#define INVOKE_PLAYER(event, pl, ...) INVOKE_(EVENT_ ## PLAYER ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__)
+#define INVOKE_MAP(event, map, ...)   INVOKE_(EVENT_ ## MAP    ## _ ## event, ARG_MAP (map)  , ## __VA_ARGS__)
 
 //TODO should index into @result
 #define RESULT(idx,type) cfperl_result_ ## type (idx)
@@ -75,29 +78,30 @@
 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 reattach (data_type type, void *self);    // called after swapin
+
+  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
 {
-  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 +109,39 @@
 {
   const char *filename;
   void *av;
+  int idx;
+
+  object_freezer (const char *filename);
+  ~object_freezer ();
+
+  void put (attachable_base *ext);
+
+  template<class subclass>
+  void put (attachable<subclass> *obj)
+  {
+    put ((attachable_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, attachable_base *ext);
+
+  template<class subclass>
+  void get (attachable<subclass> *obj)
+  {
+    if (av)
+      get (subclass::get_dt (), (subclass *)obj, obj);
+  }
 
-  object_thawer (const char *filename);
-  void get (extendable_base *object);
   void finish ();
 };