--- deliantra/server/include/cfperl.h	2007/02/15 21:07:49	1.56
+++ deliantra/server/include/cfperl.h	2007/04/23 18:09:57	1.63
@@ -138,8 +138,8 @@
   };
 
   // object is delete'd after the refcount reaches 0
-  mutable int ACC (RW, refcnt);
   int ACC (RW, flags);
+  mutable int ACC (RW, refcnt);
 
   MTH void refcnt_inc () const { ++refcnt; }
   MTH void refcnt_dec () const { --refcnt; }
@@ -207,7 +207,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-struct object_freezer : dynbuf
+struct object_freezer : dynbuf_text
 {
   AV *av;
 
@@ -337,8 +337,8 @@
 };
 
 // compatibility support, should be removed when no longer needed
-int fprintf (object_freezer &freezer, const char *format, ...);
-int fputs (const char *s, object_freezer &freezer);
+void fprintf (object_freezer &freezer, const char *format, ...);
+void fputs (const char *s, object_freezer &freezer);
 
 struct object_thawer
 {
@@ -359,19 +359,19 @@
   void get (attachable *obj, int oid);
 
   // parse next line
-  void next_kv ();
-  //TODO: remove
+  void next ();
+  // skip the current key-value (usually fetch next line, for
+  // multiline-fields, skips untilt he corresponding end-kw
+  void skip ();
+
+  //TODO: remove, deprecated
   keyword get_kv ()
   {
-    next_kv ();
+    next ();
     return kw;
   }
 
-  // skip the current key-value (usually fetch next line, for
-  // multiline-fields, skips untilt he corresponding end-kw
-  void skip_kv ();
-
-  const char *get_str () { return value; } // may be 0
+  char *get_str () { return value; } // may be 0
 
   void get (shstr &sh) const;
   void get_ornull (shstr &sh) const { sh = value; }
@@ -408,18 +408,34 @@
   static int nready () { return CORO_NREADY; }
   static int cede   () { return CORO_CEDE  ; }
 
+  static double (*time)();
+  static double next_cede;
   static int cede_counter;
 
+  static void do_cede_every ();
+  static void do_cede_to_tick ();
+  static void do_cede_to_tick_every ();
+
   static void cede_every (int count)
   {
     if (++cede_counter >= count)
-      {
-        cede_counter = 0;
+      do_cede_every ();
+  }
 
-        if (coroapi::nready ())
-          coroapi::cede ();
-      }
+  static void cede_to_tick ()
+  {
+    if (time () >= next_cede)
+      do_cede_to_tick ();
   }
+
+  static void cede_to_tick_every (int count)
+  {
+    if (++cede_counter >= count)
+      cede_to_tick ();
+  }
+
+  static void wait_for_tick ();
+  static void wait_for_tick_begin ();
 };
 
 struct watcher_base