--- deliantra/server/include/cfperl.h	2006/09/03 22:45:56	1.21
+++ deliantra/server/include/cfperl.h	2006/11/07 14:58:35	1.30
@@ -53,13 +53,13 @@
 #define ARG_INT64(v)  DT_INT64 , static_cast<sint64> (v)
 #define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
 #define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
-#define ARG_DATA(s,l) DT_DATA  , static_cast<const void *> (s), (l)
-#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<struct object *>    (o)
-#define ARG_MAP(o)    DT_MAP   , (void *)static_cast<struct mapstruct *> (o)
-#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<struct pl *>        (o)
-#define ARG_ARCH(o)   DT_ARCH  , (void *)static_cast<struct archetype *> (o)
-#define ARG_PARTY(o)  DT_PARTY , (void *)static_cast<struct party *>     (o)
-#define ARG_REGION(o) DT_REGION, (void *)static_cast<struct region *>    (o)
+#define ARG_DATA(s,l) DT_DATA  , static_cast<const void *> (s), int (l)
+#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<object *>    (o)
+#define ARG_MAP(o)    DT_MAP   , (void *)static_cast<maptile *>   (o)
+#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<player *>    (o)
+#define ARG_ARCH(o)   DT_ARCH  , (void *)static_cast<archetype *> (o)
+#define ARG_PARTY(o)  DT_PARTY , (void *)static_cast<party *>     (o)
+#define ARG_REGION(o) DT_REGION, (void *)static_cast<region *>    (o)
 
 // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
 
@@ -75,9 +75,11 @@
 //TODO should index into @result
 #define RESULT(idx,type) cfperl_result_ ## type (idx)
 #define RESULT_INT(idx) RESULT(idx, INT)
+#define RESULT_MAP(idx) RESULT(idx, MAP)
 
 bool cfperl_invoke (event_type event, ...);
 int cfperl_result_INT (int idx);
+int cfperl_result_MAP (int idx);
 
 struct attachable_base
 {
@@ -89,12 +91,34 @@
   void optimise ();  // possibly save some memory by destroying unneeded data
   void instantiate (data_type type, void *obj);
 
-  void attachable_init ()
+  void attachable_clear ()
   {
     self   = 0;
     cb     = 0;
     attach = 0;
   }
+
+  attachable_base ()
+  {
+    attachable_clear ();
+  }
+
+  ~attachable_base ()
+  {
+     clear ();
+  }
+
+  attachable_base (const attachable_base &src)
+  : self (0), cb (0), attach (src.attach)
+  {
+  }
+
+  attachable_base &operator = (const attachable_base &src)
+  {
+     clear ();
+     attach = src.attach;
+     return *this;
+  }
 };
 
 // objects attachable from perl (or any other extension) should include or
@@ -125,20 +149,18 @@
     put ((attachable_base *)obj);
   }
 
-  //TODO//temporary
-  void put (const char *k, const char *v)
+  // used only for user-defined key-value pairs
+  void put (const shstr &k, const shstr &v)
   {
     add (k);
 
-    //if (v)
-    add (' '); //TODO//cf compatibility always add space
     if (v)
-      add (v);
+      add (' '), add (v);
 
     add ('\n');
   }
 
-  //TODO//temporary
+  //TODO//temporary, used only for saving body locations
   void put (const char *k, int v)
   {
     add (k);
@@ -147,19 +169,35 @@
     add ('\n');
   }
 
-  void put (keyword k, const char *v)
+  template<typename T>
+  void put_string (keyword k, const T &v)
   {
     int klen = keyword_len [k];
-    int vlen = v ? strlen (v) : 0;
+    int vlen = v ? strlen (v) + 1 : 0;
 
-    char *p = (char *)alloc (klen + 1 + vlen + 1);
+    char *p = (char *)alloc (klen + vlen + 1);
 
     memcpy (p, keyword_str [k], klen); p += klen;
-    *p++ = ' ';  //TODO//cf compatibility always add space
-    memcpy (p, v, vlen); p += vlen;
+
+    if (v)
+      {
+        *p++ = ' ';  vlen--;
+        memcpy (p, v, vlen); p += vlen;
+      }
+
     *p = '\n';
   }
 
+  void put (keyword k, const char *v)
+  {
+    put_string (k, v);
+  }
+
+  void put (keyword k, const shstr &v)
+  {
+    put_string (k, v);
+  }
+
   void put (keyword k, double v)
   {
     char buf [128];
@@ -185,7 +223,7 @@
     add ('\n');
   }
 
-  void put (keyword kbeg, keyword kend, const char *v)
+  void put (keyword kbeg, keyword kend, const shstr &v)
   {
     add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
 
@@ -213,7 +251,10 @@
   template<typename T>
   void put (keyword k, T *v)
   {
-    put (k, v ? (const char *)v->name : 0);
+    if (v)
+      put (k, v->name);
+    else
+      put (k, (const char *)0);
   }
 
   bool save (const char *filename);
@@ -235,6 +276,7 @@
   operator bool () { return !!text; }
 
   object_thawer (const char *filename = 0);
+  object_thawer (const char *data, AV *perlav);
   ~object_thawer ();
 
   void get (data_type type, void *obj, attachable_base *ext, int oid);