--- deliantra/server/include/cfperl.h	2006/08/31 06:23:19	1.17
+++ deliantra/server/include/cfperl.h	2006/08/31 17:54:14	1.19
@@ -11,8 +11,6 @@
 #include <EXTERN.h>
 #include <perl.h>
 
-#include "keyword.h"
-
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
 #undef srand48
@@ -29,35 +27,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 +103,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 +125,35 @@
     put ((attachable_base *)obj);
   }
 
+  void put (const char *k, const char *v); //TODO//temporary
+  void put (const char *k, int v); //TODO//temporary
+
+  void put (keyword k, const char *v);
+  void put (keyword k, double v);
+  void put (keyword k, float v) { put (k, (double)v); }
+
+  void put_ (keyword k, sint32 v);
+  void put_ (keyword k, sint64 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); }
+
+  void put (keyword kbeg, keyword kend, const char *v); // multiline
+
+  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 +186,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 ();