--- deliantra/server/include/cfperl.h	2006/08/31 06:23:19	1.17
+++ deliantra/server/include/cfperl.h	2006/08/31 18:59:24	1.20
@@ -10,8 +10,7 @@
 
 #include <EXTERN.h>
 #include <perl.h>
-
-#include "keyword.h"
+#include <XSUB.h>
 
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
@@ -29,35 +28,10 @@
 #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
-// uses more explicit typing which is ok for this purpose.
-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,
-  DT_STRING,  // 0-terminated string
-  DT_DATA,    // string + length
-  DT_OBJECT,
-  DT_MAP,
-  DT_PLAYER,
-  DT_ARCH,
-  DT_PARTY,
-  DT_REGION,
-
-  NUM_DATA_TYPES
-};
-
 enum event_klass
 {
   KLASS_NONE,
@@ -130,22 +104,16 @@
 template<class subclass>
 struct attachable : attachable_base
 {
-  static data_type get_dt ()
-  {
-    return subclass::get_dt ();
-  }
-
   void instantiate ()
   {
     if (attach)
-      attachable_base::instantiate (get_dt (), static_cast<subclass *>(this));
+      attachable_base::instantiate ((data_type) cftype<subclass>::dt, static_cast<subclass *>(this));
   }
 };
 
-struct object_freezer
+struct object_freezer : dynbuf
 {
   AV *av;
-  SV *text;
 
   object_freezer ();
   ~object_freezer ();
@@ -158,6 +126,97 @@
     put ((attachable_base *)obj);
   }
 
+  //TODO//temporary
+  void put (const char *k, const char *v)
+  {
+    add (k);
+
+    //if (v)
+    add (' '); //TODO//cf compatibility always add space
+    if (v)
+      add (v);
+
+    add ('\n');
+  }
+
+  //TODO//temporary
+  void put (const char *k, int v)
+  {
+    add (k);
+    add (' ');
+    add (sint32 (v));
+    add ('\n');
+  }
+
+  void put (keyword k, const char *v)
+  {
+    int klen = keyword_len [k];
+    int vlen = v ? strlen (v) : 0;
+
+    char *p = (char *)alloc (klen + 1 + vlen + 1);
+
+    memcpy (p, keyword_str [k], klen); p += klen;
+    *p++ = ' ';  //TODO//cf compatibility always add space
+    memcpy (p, v, vlen); p += vlen;
+    *p = '\n';
+  }
+
+  void put (keyword k, double v)
+  {
+    char buf [128];
+
+    snprintf (buf, 128, "%.7g", v);
+
+    put (k, (const char *)buf);
+  }
+
+  void put_(keyword k, sint64 v)
+  {
+    add (keyword_str [k], keyword_len [k]);
+    add (' ');
+    add (v);
+    add ('\n');
+  }
+
+  void put_(keyword k, sint32 v)
+  {
+    add (keyword_str [k], keyword_len [k]);
+    add (' ');
+    add (v);
+    add ('\n');
+  }
+
+  void put (keyword kbeg, keyword kend, const char *v)
+  {
+    add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
+
+    if (v)
+      {
+        add (v);
+        add ('\n');
+      }
+
+    add (keyword_str [kend], keyword_len [kend]); add ('\n');
+  }
+
+  void put (keyword k,          float     v) { put (k, (double)v); }
+  void put (keyword k,   signed char      v) { put_(k, (sint32)v); }
+  void put (keyword k, unsigned char      v) { put_(k, (sint32)v); }
+  void put (keyword k,   signed short     v) { put_(k, (sint32)v); }
+  void put (keyword k, unsigned short     v) { put_(k, (sint32)v); }
+  void put (keyword k,   signed int       v) { put_(k, (sint32)v); }
+  void put (keyword k, unsigned int       v) { put_(k, (sint64)v); }
+  void put (keyword k,   signed long      v) { put_(k, (sint64)v); }
+  void put (keyword k, unsigned long      v) { put_(k, (sint64)v); }
+  void put (keyword k,   signed long long v) { put_(k, (sint64)v); }
+  void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
+
+  template<typename T>
+  void put (keyword k, T *v)
+  {
+    put (k, v ? (const char *)v->name : 0);
+  }
+
   bool save (const char *filename);
 
   operator bool () { return !!av; }
@@ -190,7 +249,7 @@
   void get (attachable<subclass> *obj, int oid)
   {
     if (av)
-      get (subclass::get_dt (), (subclass *)obj, obj, oid);
+      get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
   }
 
   token get_token ();