--- deliantra/server/include/cfperl.h	2007/05/28 21:15:56	1.74
+++ deliantra/server/include/cfperl.h	2007/06/09 22:54:03	1.79
@@ -94,8 +94,8 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// virtual server time, excluding time jumps and lag
-extern double runtime;
+extern tstamp runtime; // virtual server time, excluding time jumps and lag
+extern tstamp NOW;     // real time of current server tick
 
 enum event_klass
 {
@@ -176,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
@@ -265,7 +265,7 @@
   }
 
   template<typename T>
-  void put_string (keyword k, const T &v)
+  void put_kw_string (keyword k, const T &v)
   {
     int klen = keyword_len [k];
     int vlen = v ? strlen (v) + 1 : 0;
@@ -285,12 +285,12 @@
 
   void put (keyword k, const char *v = 0)
   {
-    put_string (k, v);
+    put_kw_string (k, v);
   }
 
   void put (keyword k, const shstr &v)
   {
-    put_string (k, v);
+    put_kw_string (k, v);
   }
 
   void put (keyword k, double v)
@@ -347,14 +347,9 @@
     fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
   }
 
-  template<typename T>
-  void put (keyword k, const T *v)
-  {
-    if (v)
-      put (k, v->name);
-    else
-      put (k, (const char *)0);
-  }
+  void put (keyword k, archetype *v);
+  void put (keyword k, treasurelist *v);
+  void put (keyword k, faceinfo *v);
 
   template<typename T>
   void put (keyword k, const refptr<T> &v)
@@ -432,8 +427,7 @@
   static int nready () { return CORO_NREADY; }
   static int cede   () { return CORO_CEDE  ; }
 
-  static double (*time)();
-  static double next_cede;
+  static tstamp next_cede;
   static int cede_counter;
 
   static void do_cede_every ();
@@ -446,16 +440,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 (now () < 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 ();