--- deliantra/server/include/cfperl.h	2007/05/28 03:47:44	1.71
+++ deliantra/server/include/cfperl.h	2007/05/28 05:35:51	1.73
@@ -296,6 +296,18 @@
     fadd ('\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); }
+  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 shstr &v)
   {
     force (MAX_KEYWORD_LEN + 1);
@@ -311,22 +323,10 @@
     fadd (keyword_str [kend], keyword_len [kend]); fadd ('\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); }
-  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); }
-
   template<typename T>
   void put (keyword k, const T *v)
   {
-    if (expect_true (v))
+    if (v)
       put (k, v->name);
     else
       put (k, (const char *)0);
@@ -367,16 +367,9 @@
   // parse next line
   void next ();
   // skip the current key-value (usually fetch next line, for
-  // multiline-fields, skips untilt he corresponding end-kw
+  // multiline-fields, skips till the corresponding end-kw
   void skip ();
 
-  //TODO: remove, deprecated
-  keyword get_kv ()
-  {
-    next ();
-    return kw;
-  }
-
   char *get_str () { return value; } // may be 0
   void get_ml (keyword kend, shstr &sh);