--- deliantra/server/include/cfperl.h	2007/05/28 05:35:51	1.73
+++ deliantra/server/include/cfperl.h	2007/06/05 13:05:02	1.77
@@ -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
@@ -326,10 +350,7 @@
   template<typename T>
   void put (keyword k, const T *v)
   {
-    if (v)
-      put (k, v->name);
-    else
-      put (k, (const char *)0);
+    put (k, v ? &v->name : (const char *)0);
   }
 
   template<typename T>
@@ -422,16 +443,21 @@
       do_cede_every ();
   }
 
-  static void cede_to_tick ()
+  static bool cede_to_tick ()
   {
-    if (expect_false (time () >= next_cede))
-      do_cede_to_tick ();
+    if (expect_true (time () < next_cede))
+      return false;
+
+    do_cede_to_tick ();
+    return true;
   }
 
-  static void cede_to_tick_every (int count)
+  static bool cede_to_tick_every (int count)
   {
-    if (expect_false (++cede_counter >= count))
-      cede_to_tick ();
+    if (expect_true (++cede_counter < count))
+      return false;
+
+    return cede_to_tick ();
   }
 
   static void wait_for_tick ();