--- deliantra/server/include/cfperl.h	2006/08/27 17:59:26	1.10
+++ deliantra/server/include/cfperl.h	2006/08/30 16:30:37	1.16
@@ -4,11 +4,35 @@
 #ifndef CFPERL_H__
 #define CFPERL_H__
 
+#include <cstdio>
+
+using namespace std;
+
+#include <EXTERN.h>
+#include <perl.h>
+
+// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
+#undef localtime
+#undef srand48
+#undef drand48
+#undef srandom
+#undef readdir
+#undef getprotobyname
+#undef gethostbyname
+#undef ctime
+#undef strerror
+
+// perl bug #40256: perl does overwrite those with reentrant versions
+// but does not initialise their state structures.
+#undef random
+#undef crypt
+
 struct pl;
 struct object;
 struct mapstruct;
 
 void cfperl_init ();
+void cfperl_boot ();
 void cfperl_main ();
 
 // could have used templates, but a more traditional C api
@@ -16,6 +40,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 +52,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 +73,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)
@@ -80,15 +106,18 @@
 
 struct attachable_base
 {
-  void *self, *cb;    // CF+ perl self and callback
+  struct sv *self;
+  struct av *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 attachable_init ()
   {
-    self = cb = 0;
+    self   = 0;
+    cb     = 0;
     attach = 0;
   }
 };
@@ -101,15 +130,25 @@
 {
   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;
+  struct av *av;
+};
+
+struct object_freezer : object_freezethaw
+{
+  struct sv *text;
+  void *filename;
 
   object_freezer (const char *filename);
   ~object_freezer ();
@@ -122,28 +161,31 @@
     put ((attachable_base *)obj);
   }
 
-  void finish ();
+  operator bool () { return !!av; }
 };
 
-struct object_thawer
+struct object_thawer : object_freezethaw
 {
-  void *av;
-  int idx;
+  FILE *fp;
 
   object_thawer (const char *filename = 0);
   ~object_thawer ();
 
-  void get (data_type type, void *obj, attachable_base *ext);
+  void get (data_type type, void *obj, attachable_base *ext, int oid);
 
   template<class subclass>
-  void get (attachable<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 ();
+  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