--- deliantra/server/include/cfperl.h	2006/08/31 17:54:14	1.19
+++ deliantra/server/include/cfperl.h	2006/08/31 18:59:24	1.20
@@ -10,6 +10,7 @@
 
 #include <EXTERN.h>
 #include <perl.h>
+#include <XSUB.h>
 
 // optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
 #undef localtime
@@ -125,16 +126,80 @@
     put ((attachable_base *)obj);
   }
 
-  void put (const char *k, const char *v); //TODO//temporary
-  void put (const char *k, int v); //TODO//temporary
+  //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);
-  void put (keyword k, double v);
-  void put (keyword k, float v) { put (k, (double)v); }
+  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);
 
-  void put_ (keyword k, sint32 v);
-  void put_ (keyword k, sint64 v);
+    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); }
@@ -146,8 +211,6 @@
   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)
   {