--- deliantra/server/include/cfperl.h	2006/09/10 14:54:02	1.25
+++ deliantra/server/include/cfperl.h	2006/11/07 16:30:55	1.31
@@ -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
 {
@@ -147,8 +149,8 @@
     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);
 
@@ -158,7 +160,7 @@
     add ('\n');
   }
 
-  //TODO//temporary
+  //TODO//temporary, used only for saving body locations
   void put (const char *k, int v)
   {
     add (k);
@@ -167,8 +169,8 @@
     add ('\n');
   }
 
-#if 1
-  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) + 1 : 0;
@@ -179,33 +181,22 @@
 
     if (v)
       {
-        *p++ = ' ';  vlen--; //TODO//cf compatibility always add space
+        *p++ = ' ';  vlen--;
         memcpy (p, v, vlen); p += vlen;
       }
 
     *p = '\n';
   }
-#endif
 
-#if 0
-  void put (keyword k, const shstr &v)
+  void put (keyword k, const char *v)
   {
-    int klen = keyword_len [k];
-    int vlen = v ? v.length () + 1 : 0;
-
-    char *p = (char *)alloc (klen + vlen + 1);
-
-    memcpy (p, keyword_str [k], klen); p += klen;
-
-    if (v)
-      {
-        *p++ = ' ';  vlen--; //TODO//cf compatibility always add space
-        memcpy (p, v, vlen); p += vlen;
-      }
+    put_string (k, v);
+  }
 
-    *p = '\n';
+  void put (keyword k, const shstr &v)
+  {
+    put_string (k, v);
   }
-#endif
 
   void put (keyword k, double v)
   {
@@ -267,6 +258,7 @@
   }
 
   bool save (const char *filename);
+  char *as_string (); // like strdup
 
   operator bool () { return !!av; }
 };
@@ -285,6 +277,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);