--- deliantra/server/include/cfperl.h	2007/05/27 23:56:21	1.70
+++ deliantra/server/include/cfperl.h	2007/06/04 12:19:08	1.76
@@ -1,3 +1,27 @@
+/*
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
+
 //
 // cfperl.h perl interface
 //
@@ -152,7 +176,7 @@
 
   MTH int refcnt_cnt () const;
   // check wether the object has died and destroy
-  MTH void refcnt_chk () { if (refcnt <= 0) do_check (); }
+  MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
 
   // destroy the object unless it was already destroyed
   // this politely asks everybody interested the reduce
@@ -296,6 +320,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,25 +347,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))
-      put (k, v->name);
-    else
-      put (k, (const char *)0);
+    put (k, v ? &v->name : (const char *)0);
   }
 
   template<typename T>
@@ -367,16 +388,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);
 
@@ -385,8 +399,8 @@
 
   bool   get_bool   () const { return *value_nn == '1'; }
   sint32 get_sint32 () const;
-  sint64 get_sint64 () const { return atoll (value_nn); }
-  double get_double () const { return atof  (value_nn); }
+  sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
+  double get_double () const { return strtod  (value_nn, 0); }
 
   void get (float  &v) { v = get_double (); }
   void get (double &v) { v = get_double (); }