--- deliantra/server/include/cfperl.h	2006/09/10 14:54:02	1.25
+++ deliantra/server/include/cfperl.h	2006/12/14 05:09:32	1.35
@@ -35,9 +35,11 @@
 {
   KLASS_NONE,
   KLASS_GLOBAL,
+  KLASS_SOCKET,
   KLASS_PLAYER,
   KLASS_OBJECT,
   KLASS_MAP,
+  KLASS_COMMAND,
 };
 
 enum event_type
@@ -53,36 +55,40 @@
 #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)
+#define ARG_SOCKET(o) DT_SOCKET, (void *)static_cast<client_socket *> (o)
 
 // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
 
 // all these return true when the normal event processing should be skipped (if any)
 #define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END)
 
-#define INVOKE(klass, event, ...)     INVOKE_(EVENT_ ## klass  ## _ ## event,                  ## __VA_ARGS__)
-#define INVOKE_GLOBAL(event, ...)     INVOKE_(EVENT_ ## GLOBAL ## _ ## event,                  ## __VA_ARGS__)
-#define INVOKE_OBJECT(event, op, ...) INVOKE_(EVENT_ ## OBJECT ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__)
-#define INVOKE_PLAYER(event, pl, ...) INVOKE_(EVENT_ ## PLAYER ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__)
-#define INVOKE_MAP(event, map, ...)   INVOKE_(EVENT_ ## MAP    ## _ ## event, ARG_MAP (map)  , ## __VA_ARGS__)
+#define INVOKE(klass, event, ...)      INVOKE_(EVENT_ ## klass   ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_GLOBAL(event, ...)      INVOKE_(EVENT_ ## GLOBAL  ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_OBJECT(event, op, ...)  INVOKE_(EVENT_ ## OBJECT  ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__)
+#define INVOKE_SOCKET(event, ns, ...)  INVOKE_(EVENT_ ## SOCKET  ## _ ## event, ARG_SOCKET (ns), ## __VA_ARGS__)
+#define INVOKE_PLAYER(event, pl, ...)  INVOKE_(EVENT_ ## PLAYER  ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__)
+#define INVOKE_MAP(event, map, ...)    INVOKE_(EVENT_ ## MAP     ## _ ## event, ARG_MAP (map)  , ## __VA_ARGS__)
 
 //TODO should index into @result
 #define RESULT(idx,type) cfperl_result_ ## type (idx)
-#define RESULT_INT(idx) RESULT(idx, INT)
+#define RESULT_DOUBLE(idx) RESULT(idx, DOUBLE)
+#define RESULT_INT(idx)    RESULT(idx, INT)
 
 bool cfperl_invoke (event_type event, ...);
+double cfperl_result_DOUBLE (int idx);
 int cfperl_result_INT (int idx);
 
 struct attachable_base
 {
-  SV *self;
-  AV *cb;    // CF+ perl self and callback
+  SV *self;     // CF+ perl self
+  AV *cb;       // CF+ callbacks
   shstr attach; // generic extension attachment information
 
   void clear ();     // called when free'ing objects
@@ -111,11 +117,11 @@
   {
   }
 
-  attachable_base &operator = (const attachable_base &src)
+  attachable_base &operator =(const attachable_base &src)
   {
-     clear ();
-     attach = src.attach;
-     return *this;
+    clear ();
+    attach = src.attach;
+    return *this;
   }
 };
 
@@ -147,8 +153,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 +164,7 @@
     add ('\n');
   }
 
-  //TODO//temporary
+  //TODO//temporary, used only for saving body locations
   void put (const char *k, int v)
   {
     add (k);
@@ -167,8 +173,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 +185,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)
   {
@@ -258,7 +253,7 @@
   void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
 
   template<typename T>
-  void put (keyword k, T *v)
+  void put (keyword k, const T *v)
   {
     if (v)
       put (k, v->name);
@@ -266,7 +261,14 @@
       put (k, (const char *)0);
   }
 
+  template<typename T>
+  void put (keyword k, const refptr<T> &v)
+  {
+    put (k, (T *)v);
+  }
+
   bool save (const char *filename);
+  char *as_string (); // like strdup
 
   operator bool () { return !!av; }
 };
@@ -285,6 +287,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);